Merge pull request #114817 from thefloweringash/darwin-arch

darwin: introduce darwinArch, apply in {cc,bintools}-wrappers
2021-03-02 15:27:15 -05:00
parent f5bb0053a6 8feb949ab5
commit 09d0e10e95
6 changed files with 16 additions and 13 deletions
@@ -305,6 +305,10 @@ stdenv.mkDerivation {
      done
    ''

+    + optionalString stdenv.targetPlatform.isDarwin ''
+      echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
+    ''
+
    + ''
      for flags in "$out/nix-support"/*flags*; do
        substituteInPlace "$flags" --replace $'\n' ' '
@@ -481,6 +481,10 @@ stdenv.mkDerivation {
      substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
    ''

+    + optionalString stdenv.targetPlatform.isDarwin ''
+      echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags
+    ''
+
    ##
    ## Extra custom steps
    ##