diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 21:59:19 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 23:09:17 +0200 |
| commit | 77b409b2cf75076289e778d6caeec0f53a34317e (patch) | |
| tree | 53ab5a9d9229e7303707f885c513258a557e1351 | |
| parent | aa3d195a304360a79a0dd639037a92118a62f539 (diff) | |
| download | nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar.gz nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar.bz2 nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar.lz nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar.xz nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.tar.zst nixpkgs-77b409b2cf75076289e778d6caeec0f53a34317e.zip | |
gcc49: Reduce diff to gcc5
| -rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 362670ff5db..ecd46be34e5 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -106,7 +106,7 @@ let version = "4.9.4"; gccFpu = platform.gcc.fpu or null; gccFloat = platform.gcc.float or null; gccMode = platform.gcc.mode or null; - in + in optional (gccArch != null) "--with-arch=${gccArch}" ++ optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ optional (gccAbi != null) "--with-abi=${gccAbi}" ++ @@ -421,7 +421,7 @@ stdenv.mkDerivation ({ CC_FOR_TARGET = "${targetPlatform.config}-gcc"; NM_FOR_TARGET = "${targetPlatform.config}-nm"; CXX_FOR_TARGET = "${targetPlatform.config}-g++"; - # If we are making a cross compiler, cross != null + # If we are making a cross compiler, targetPlatform != hostPlatform NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc; dontStrip = true; configureFlags = @@ -501,7 +501,7 @@ stdenv.mkDerivation ({ EXTRA_TARGET_CFLAGS = if targetPlatform != hostPlatform && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" + "-idirafter ${getDev libcCross}/include" ] ++ optionals (! crossStageStatic) [ "-B${libcCross.out}/lib" |