|
8 | 8 | RUSTUP_PATH = os.getenv('HOME') + '/.cargo/bin/rustup'
|
9 | 9 | RUSTC_PATH = os.getenv('HOME') + '/.cargo/bin/rustc'
|
10 | 10 | 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 |
12 | 14 |
|
13 | 15 |
|
14 | 16 | def run(config: ScriptConfig):
|
@@ -57,15 +59,13 @@ def run(config: ScriptConfig):
|
57 | 59 | child_environment = dict(os.environ)
|
58 | 60 | child_environment['RUSTFLAGS'] = '--cfg=c_bindings'
|
59 | 61 | child_environment['PATH'] = '/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin'
|
| 62 | + |
60 | 63 | # 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' |
63 | 65 | 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' |
65 | 66 | # child_environment['RUSTFLAGS'] = '--cfg=c_bindings -C link-arg=-mios-version-min=14.0'
|
66 | 67 | # child_environment['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
|
67 | 68 |
|
68 |
| - # subprocess.check_call([RUSTUP_PATH, 'override', 'set', 'nightly-2022-05-13'], cwd=config.LDK_C_BINDINGS_DIRECTORY) |
69 | 69 | subprocess.check_call([RUSTUP_PATH, 'override', 'set', NIGHTLY_TOOLCHAIN], cwd=config.LDK_C_BINDINGS_DIRECTORY)
|
70 | 70 |
|
71 | 71 | lipo_executables_input: [str] = []
|
|
0 commit comments