Skip to content

Commit 9cfffb7

Browse files
committed
tools: --check-cfg has been stabilized
rust-lang/rust#123501
1 parent f566a0b commit 9cfffb7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tools/build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,13 @@ if [[ "${rustc_version}" == *"nightly"* ]] || [[ "${rustc_version}" == *"dev"* ]
228228
if [[ -z "${is_custom_toolchain}" ]]; then
229229
rustup ${pre_args[@]+"${pre_args[@]}"} component add rust-src &>/dev/null
230230
fi
231-
# The latest syntax of -Z check-cfg requires 1.75.0-nightly.
231+
# The latest syntax of cargo -Z check-cfg requires 1.75.0-nightly.
232+
# rustc --check-cfg has been stabilized in 1.79.
232233
# We only check this on the recent nightly to avoid old clippy bugs.
233234
# shellcheck disable=SC2207
234235
if [[ "${rustc_minor_version}" -ge 79 ]] && [[ -n "${TESTS:-}" ]] && [[ -z "${TARGET_GROUP:-}" ]]; then
235236
build_scripts=(build.rs portable-atomic-util/build.rs)
236-
check_cfg='-Z unstable-options --check-cfg=cfg(target_pointer_width,values("128")) --check-cfg=cfg(target_arch,values("xtensa")) --check-cfg=cfg(target_feature,values("lse2","lse128","rcpc3","quadword-atomics","fast-serialization","load-store-on-cond","distinct-ops","miscellaneous-extensions-3"))'
237+
check_cfg='--check-cfg=cfg(target_pointer_width,values("128")) --check-cfg=cfg(target_arch,values("xtensa")) --check-cfg=cfg(target_feature,values("lse2","lse128","rcpc3","quadword-atomics","fast-serialization","load-store-on-cond","distinct-ops","miscellaneous-extensions-3"))'
237238
known_cfgs+=($(grep -E 'cargo:rustc-cfg=' "${build_scripts[@]}" | sed -E 's/^.*cargo:rustc-cfg=//; s/(=\\)?".*$//' | LC_ALL=C sort -u))
238239
# TODO: handle multi-line target_feature_if
239240
known_target_feature_values+=($(grep -E 'target_feature_if\("' "${build_scripts[@]}" | sed -E 's/^.*target_feature_if\(//; s/",.*$/"/' | LC_ALL=C sort -u))

0 commit comments

Comments
 (0)