From 1c72a94b2f2c652bc388e06ca21e67fe881e7dc2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 15 Jan 2024 12:45:55 +0530 Subject: [PATCH] Fix universal build with cf-protection failing --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c3b479fed..b48361880 100755 --- a/setup.py +++ b/setup.py @@ -451,7 +451,8 @@ def init_env( # Using -mbranch-protection=standard causes crashes on Linux ARM, reported # in https://github.com/kovidgoyal/kitty/issues/6845#issuecomment-1835886938 arm_control_flow_protection = '-mbranch-protection=standard' if is_macos else '' - intel_control_flow_protection = '-fcf-protection=full' if ccver >= (9, 0) else '' + # Universal build fails with -fcf-protection clang is not smart enough to filter it out for the ARM part + intel_control_flow_protection = '-fcf-protection=full' if ccver >= (9, 0) and not build_universal_binary else '' control_flow_protection = arm_control_flow_protection if is_arm else intel_control_flow_protection cflags_ = os.environ.get( 'OVERRIDE_CFLAGS', (