Merge pull request #317224 from ju1m/NIX_CFLAGS_COMPILE

cc-wrapper: fix -Bprefix to not confuse lib/libc++.so and bin/c++
This commit is contained in:
Randy Eckenrode 2024-07-28 20:18:22 -04:00 committed by GitHub
commit 9a4c598e0a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -29,8 +29,8 @@ done
# Arocc does not support "-B"
if [[ -z "@isArocc@" ]]; then
# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
NIX_CFLAGS_COMPILE_@suffixSalt@="-B@out@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
# `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld.
NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
fi
# Export and assign separately in order that a failing $(..) will fail