fixup! cc-wrapper: disable dynamic linker for darwin

NixOS · Dec 21, 2020 · 7b4f7da · 7b4f7da
1 parent 708cb80
commit 7b4f7da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -30,10 +30,6 @@ cppInclude=1
 cInclude=1
 setDynamicLinker=1
 
-if [[ "@isdarwin@" = "1" ]]; then
-    setDynamicLinker=0
-fi
-
 expandResponseParams "$@"
 declare -i n=0
 nParams=${#params[@]}
@@ -150,6 +146,12 @@ extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_B
 
 if [ "$dontLink" != 1 ]; then
 
+    # Disable the -dynamic-linker flag if NIX_DYNAMIC_LINKER is the special darwin
+    # value. -dynamic-linker is not supported on darwin systems.
+    if [[ "$NIX_DYNAMIC_LINKER_@suffixSalt@" = "darwin" ]]; then
+        setDynamicLinker=0
+    fi
+
     # Add the flags that should only be passed to the compiler when
     # linking.
     extraAfter+=($NIX_CFLAGS_LINK_@suffixSalt@)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
@@ -36,6 +36,7 @@ in rec {
     export NIX_ENFORCE_NO_NATIVE=''${NIX_ENFORCE_NO_NATIVE-1}
     export NIX_ENFORCE_PURITY=''${NIX_ENFORCE_PURITY-1}
     export NIX_IGNORE_LD_THROUGH_GCC=1
+    export NIX_DYNAMIC_LINKER="darwin"
     unset SDKROOT
 
     export MACOSX_DEPLOYMENT_TARGET=${macosVersionMin}