summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-10 15:48:34 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-11 22:26:39 +0200
commit79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63 (patch)
treeafa526bc7412c3c69f4ea12d0c8f0c97e37f09d6 /pkgs/stdenv
parent0d67d13527f0b984ae4a1d0f362a947b16a86bf8 (diff)
downloadnixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar.gz
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar.bz2
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar.lz
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar.xz
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.tar.zst
nixpkgs-79d0d7b4376b3fbc9ccdda7d95ed0b39b37ffc63.zip
Unify gcc-wrapper and clang-wrapper
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/darwin/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 787180cbe3a..03bae7de196 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -24,13 +24,13 @@ import ../generic rec {
 
   system = stdenv.system;
 
-  gcc = import ../../build-support/clang-wrapper {
+  gcc = import ../../build-support/gcc-wrapper {
     nativeTools = false;
     nativeLibc = true;
     inherit stdenv;
     extraPackages = stdenv.lib.optional haveLibCxx pkgs.libcxx;
     binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
-    clang = if useClang33 then pkgs.clang_33.clang else pkgs.clang.clang;
+    gcc = if useClang33 then pkgs.clang_33.gcc else pkgs.clang.gcc;
     coreutils = pkgs.coreutils;
     shell = pkgs.bash + "/bin/sh";
   };