diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 1595b7f336f..1be771ac705 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { } "; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langF77; isGNU = true; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 45040c2f375..3db8ee5f3ea 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -171,6 +171,8 @@ stdenv.mkDerivation ({ rm -Rf ghdl-* ''; + passthru.isGNU = true; + meta = { homepage = "http://ghdl.free.fr/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index c78de2265f3..47c8c86a95d 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; # ghdl does not build fine with parallel building # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173 diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 931c5c413de..c4be4f266dd 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -358,7 +358,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 78666c8cdce..0f65a89bd20 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -427,7 +427,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; }; + langGo version; isGNU = true; }; enableParallelBuilding = false; diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index aeaa476df12..0e8fd29dc9e 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { cc = stdenv.cc.cc; }; + passthru = { cc = stdenv.cc.cc; gcc = gccReal; }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 612e63eafd4..4c962cb2d26 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { ''; passthru.cc = stdenv.cc.cc; + # GCC_INSTALL_PREFIX points here, so just use it even though it may not + # actually be a gcc + passthru.gcc = stdenv.cc.cc; enableParallelBuilding = true; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index f73f47ab87b..0b42b88ef7a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,7 +41,7 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" { } + links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then