Merge pull request #317224 from ju1m/NIX_CFLAGS_COMPILE

cc-wrapper: fix -Bprefix to not confuse lib/libc++.so and bin/c++
2024-07-28 20:18:22 -04:00
parent 2b898b30ea 97c400a0e8
commit 9a4c598e0a
1 changed files with 2 additions and 2 deletions
@@ -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