diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 22:34:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-07-14 22:34:24 +0000 |
| commit | 3defd9a3d3011be9be039519f7b32176365e2baa (patch) | |
| tree | f995651779a166c05873aec20d4a2eda5198c456 /pkgs/stdenv/nix | |
| parent | 4ac32aa6398ae5de1eedd426c935c4e6ff1a2588 (diff) | |
| download | nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar.gz nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar.bz2 nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar.lz nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar.xz nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.tar.zst nixlib-3defd9a3d3011be9be039519f7b32176365e2baa.zip | |
* On Darwin, use Apple's gcc fork.
svn path=/nixpkgs/trunk/; revision=5715
Diffstat (limited to 'pkgs/stdenv/nix')
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index c1ca98f60609..3b5c1de765c6 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -12,11 +12,11 @@ import ../generic { nativeGlibc = true; inherit stdenv; binutils = - if stdenv.system == "i686-darwin" || stdenv.system == "powerpc-darwin" then + if stdenv.isDarwin then import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;} else pkgs.binutils; - gcc = pkgs.gcc.gcc; + gcc = if stdenv.isDarwin then pkgs.gccApple.gcc else pkgs.gcc.gcc; shell = pkgs.bash ~ /bin/sh; }; |