From e01621c0ac69e04834045d5632cab5ba911f7a35 Mon Sep 17 00:00:00 2001 From: Arik Sosman Date: Tue, 25 Feb 2025 10:37:21 -0800 Subject: [PATCH] Identify the precise responsible CFLAG parameter --- scripts/build_individual_libldk.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build_individual_libldk.py b/scripts/build_individual_libldk.py index f87bea7e..297e5ffb 100644 --- a/scripts/build_individual_libldk.py +++ b/scripts/build_individual_libldk.py @@ -8,7 +8,9 @@ RUSTUP_PATH = os.getenv('HOME') + '/.cargo/bin/rustup' RUSTC_PATH = os.getenv('HOME') + '/.cargo/bin/rustc' CARGO_PATH = os.getenv('HOME') + '/.cargo/bin/cargo' -NIGHTLY_TOOLCHAIN = 'nightly-2022-06-24' + +# 1.62: nightly-2022-05-13 +NIGHTLY_TOOLCHAIN = 'nightly-2022-06-24' # 1.63 def run(config: ScriptConfig): @@ -57,15 +59,13 @@ def run(config: ScriptConfig): child_environment = dict(os.environ) child_environment['RUSTFLAGS'] = '--cfg=c_bindings' child_environment['PATH'] = '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' + # stop cargo's obsession with x86_64-apple-ios13.0-macabi when nobody asked for it - child_environment['CFLAGS_x86_64_apple_ios_macabi'] = '--target=x86_64-apple-ios-macabi' - child_environment['CFLAGS_x86_64_apple_ios_macbi'] = '--target=x86_64-apple-ios-macabi' + # child_environment['CFLAGS_x86_64_apple_ios_macabi'] = '--target=x86_64-apple-ios-macabi' child_environment['CFLAGS_x86_64_apple_ios13.0_macabi'] = '--target=x86_64-apple-ios-macabi' - child_environment['CFLAGS_x86_64_apple_ios13.0_macbi'] = '--target=x86_64-apple-ios-macabi' # child_environment['RUSTFLAGS'] = '--cfg=c_bindings -C link-arg=-mios-version-min=14.0' # child_environment['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0' - # subprocess.check_call([RUSTUP_PATH, 'override', 'set', 'nightly-2022-05-13'], cwd=config.LDK_C_BINDINGS_DIRECTORY) subprocess.check_call([RUSTUP_PATH, 'override', 'set', NIGHTLY_TOOLCHAIN], cwd=config.LDK_C_BINDINGS_DIRECTORY) lipo_executables_input: [str] = []