Skip to content

Commit

Permalink
Upgrade Rust version to 2024-12-17 nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
akonradi-signal authored Dec 20, 2024
1 parent 29777f0 commit 46ed44c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion node/build_node_bridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ def main(args: Optional[List[str]] = None) -> int:
# Link it statically to avoid propagating that dependency.
cargo_env['RUSTFLAGS'] += ' -C target-feature=+crt-static'

# Hint to the Rust compiler that we're cross-compiling. This shouldn't be necessary
# since the invoking build script (if any) should be doing that but it's needed
# since Rust nightly-2024-10-03.
cargo_env['VSCMD_ARG_TGT_ARCH'] = node_arch

# Save the debug info in PDB format...
cargo_env['CARGO_PROFILE_RELEASE_SPLIT_DEBUGINFO'] = 'packed'
# ...and DLLs don't have anything to strip.
Expand Down Expand Up @@ -174,7 +179,11 @@ def main(args: Optional[List[str]] = None) -> int:

objcopy = shutil.which('%s-linux-gnu-objcopy' % cargo_target.split('-')[0]) or 'objcopy'

print("with environment: %s" % (' '.join("%s=%s" % (k, v) for (k, v) in cargo_env.items())))
print("with environment:")
for (k, v) in cargo_env.items():
print("%s=%s" % (k, v))
print("", flush=True)

subprocess.check_call(cmdline, env=cargo_env)

libs_in = os.path.join(cargo_env['CARGO_BUILD_TARGET_DIR'],
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2024-08-30
nightly-2024-12-17

0 comments on commit 46ed44c

Please sign in to comment.