Skip to content

Commit e01621c

Browse files
committed
Identify the precise responsible CFLAG parameter
1 parent 0d9f9b4 commit e01621c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/build_individual_libldk.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
RUSTUP_PATH = os.getenv('HOME') + '/.cargo/bin/rustup'
99
RUSTC_PATH = os.getenv('HOME') + '/.cargo/bin/rustc'
1010
CARGO_PATH = os.getenv('HOME') + '/.cargo/bin/cargo'
11-
NIGHTLY_TOOLCHAIN = 'nightly-2022-06-24'
11+
12+
# 1.62: nightly-2022-05-13
13+
NIGHTLY_TOOLCHAIN = 'nightly-2022-06-24' # 1.63
1214

1315

1416
def run(config: ScriptConfig):
@@ -57,15 +59,13 @@ def run(config: ScriptConfig):
5759
child_environment = dict(os.environ)
5860
child_environment['RUSTFLAGS'] = '--cfg=c_bindings'
5961
child_environment['PATH'] = '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
62+
6063
# stop cargo's obsession with x86_64-apple-ios13.0-macabi when nobody asked for it
61-
child_environment['CFLAGS_x86_64_apple_ios_macabi'] = '--target=x86_64-apple-ios-macabi'
62-
child_environment['CFLAGS_x86_64_apple_ios_macbi'] = '--target=x86_64-apple-ios-macabi'
64+
# child_environment['CFLAGS_x86_64_apple_ios_macabi'] = '--target=x86_64-apple-ios-macabi'
6365
child_environment['CFLAGS_x86_64_apple_ios13.0_macabi'] = '--target=x86_64-apple-ios-macabi'
64-
child_environment['CFLAGS_x86_64_apple_ios13.0_macbi'] = '--target=x86_64-apple-ios-macabi'
6566
# child_environment['RUSTFLAGS'] = '--cfg=c_bindings -C link-arg=-mios-version-min=14.0'
6667
# child_environment['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
6768

68-
# subprocess.check_call([RUSTUP_PATH, 'override', 'set', 'nightly-2022-05-13'], cwd=config.LDK_C_BINDINGS_DIRECTORY)
6969
subprocess.check_call([RUSTUP_PATH, 'override', 'set', NIGHTLY_TOOLCHAIN], cwd=config.LDK_C_BINDINGS_DIRECTORY)
7070

7171
lipo_executables_input: [str] = []

0 commit comments

Comments
 (0)