Skip to content

Commit f7f1aa9

Browse files
committed
fix: compose nightly linker rustflags
Ensure PLATFORM_NIGHTLY_RUSTFLAGS is loaded and RUSTFLAGS composition preserves existing values while appending optional fast-linker defaults.
1 parent e509a76 commit f7f1aa9

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.cargo/config.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs = "default"
2424
# PLATFORM_RUST_NIGHTLY: set to 1 to force nightly flags.
2525
PLATFORM_DISABLE_NIGHTLY = { value = "${PLATFORM_DISABLE_NIGHTLY}", force = false }
2626
PLATFORM_RUST_NIGHTLY = { value = "${PLATFORM_RUST_NIGHTLY}", force = false }
27+
PLATFORM_NIGHTLY_RUSTFLAGS = { value = "${PLATFORM_NIGHTLY_RUSTFLAGS}", force = false }
2728
# Fast-linker defaults are opt-in: set PLATFORM_FAST_LINKER_RUSTFLAGS
2829
# or PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN to enable on a system
2930
# with the desired linker installed. Set PLATFORM_DISABLE_FAST_LINKER=1
@@ -33,7 +34,7 @@ PLATFORM_FAST_LINKER_RUSTFLAGS = { value = "${PLATFORM_FAST_LINKER_RUSTFLAGS}",
3334
PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN = { value = "${PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN}", force = false }
3435
PLATFORM_LINKER_RUSTFLAGS = { value = "${PLATFORM_LINKER_RUSTFLAGS}", force = false }
3536
PLATFORM_LINKER_RUSTFLAGS_DARWIN = { value = "${PLATFORM_LINKER_RUSTFLAGS_DARWIN}", force = false }
36-
RUSTFLAGS = { value = "${PLATFORM_NIGHTLY_RUSTFLAGS} ${PLATFORM_FAST_LINKER_RUSTFLAGS} ${PLATFORM_LINKER_RUSTFLAGS}", force = false }
37+
RUSTFLAGS = { value = "${RUSTFLAGS} ${PLATFORM_NIGHTLY_RUSTFLAGS} ${PLATFORM_FAST_LINKER_RUSTFLAGS} ${PLATFORM_LINKER_RUSTFLAGS}", force = true }
3738

3839
[target.'cfg(target_os = "macos")'.env]
39-
RUSTFLAGS = { value = "${PLATFORM_NIGHTLY_RUSTFLAGS} ${PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN} ${PLATFORM_LINKER_RUSTFLAGS_DARWIN}", force = false }
40+
RUSTFLAGS = { value = "${RUSTFLAGS} ${PLATFORM_NIGHTLY_RUSTFLAGS} ${PLATFORM_FAST_LINKER_RUSTFLAGS_DARWIN} ${PLATFORM_LINKER_RUSTFLAGS_DARWIN}", force = true }

0 commit comments

Comments
 (0)