Skip to content

Commit 5ccf447

Browse files
committed
Use specific nightly toolchain for debugging
1 parent 4635c1a commit 5ccf447

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scripts/build_bulk_libldks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ def parse_config() -> ScriptConfig:
1515
)
1616

1717
individual_configurations: [BuildConfig] = [
18+
BuildConfig('macosx', '-macabi', ['arm64', 'x86_64']),
1819
BuildConfig('iphoneos', '', ['arm64']),
1920
BuildConfig('iphonesimulator', '-simulator', ['arm64', 'x86_64']),
2021
BuildConfig('macosx', '', ['arm64', 'x86_64']),
21-
BuildConfig('macosx', '-macabi', ['arm64', 'x86_64'])
2222
]
2323
config.LIBLDK_BUILD_CONFIGURATIONS = individual_configurations
2424

scripts/build_individual_libldk.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
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'
1112

1213

1314
def run(config: ScriptConfig):
@@ -59,7 +60,7 @@ def run(config: ScriptConfig):
5960
child_environment['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
6061

6162
# subprocess.check_call([RUSTUP_PATH, 'override', 'set', 'nightly-2022-05-13'], cwd=config.LDK_C_BINDINGS_DIRECTORY)
62-
subprocess.check_call([RUSTUP_PATH, 'override', 'set', 'nightly-2022-06-24'], cwd=config.LDK_C_BINDINGS_DIRECTORY)
63+
subprocess.check_call([RUSTUP_PATH, 'override', 'set', NIGHTLY_TOOLCHAIN], cwd=config.LDK_C_BINDINGS_DIRECTORY)
6364

6465
lipo_executables_input: [str] = []
6566

@@ -105,7 +106,7 @@ def run(config: ScriptConfig):
105106
print('Rust target OS:', rust_target_os)
106107
print('Target:', rust_target_triplet)
107108

108-
subprocess.check_call([RUSTC_PATH, '+nightly', '-Z', 'unstable-options', '--print', 'target-spec-json', '--target', rust_target_triplet])
109+
subprocess.check_call([RUSTC_PATH, f'+{NIGHTLY_TOOLCHAIN}', '-Z', 'unstable-options', '--print', 'target-spec-json', '--target', rust_target_triplet])
109110

110111
# cargo build -Z build-std=panic_abort,std --features "std" --target "${RUST_ARCH}-apple-${RUST_TARGET_OS}" $RUST_CONFIGURATION_FLAG
111112
build_arguments = [CARGO_PATH, 'build', '-Z', 'build-std=panic_abort,std', '--features', 'std', '--target', rust_target_triplet]

0 commit comments

Comments
 (0)