diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-09-04 19:50:01 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 20:56:19 +0000 |
commit | e0b591919707f07fd1c42646c6deb13f0dd4914a (patch) | |
tree | f5da15da5b1ad8d11ff65d52e78acbf6b6c00a7b /pkgs/development/compilers/gcc/6 | |
parent | 87c02060383a689e81749643a39dbcc3c4fc6ad1 (diff) | |
download | nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar.gz nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar.bz2 nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar.lz nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar.xz nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.tar.zst nixpkgs-e0b591919707f07fd1c42646c6deb13f0dd4914a.zip |
gcc-*: homogenize and cleanup expressions without a rebuild
Looks scary but it is a noop.
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 4760d18a7d8..557c8ceba8a 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -50,8 +50,6 @@ with builtins; let version = "6.4.0"; - enableParallelBuilding = true; - inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = @@ -257,8 +255,7 @@ stdenv.mkDerivation ({ '' + stdenv.lib.optionalString (langJava || langGo) '' export lib=$out; - '' - ; + ''; dontDisableStatic = true; @@ -380,7 +377,8 @@ stdenv.mkDerivation ({ ++ optional (zlib != null) zlib ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ])); + ++ optionals javaAwtGtk [ gmp mpfr ] + )); EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) @@ -401,10 +399,13 @@ stdenv.mkDerivation ({ "-Wl,-rpath-link,${libcCross.out}/lib" ])); - passthru = - { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; }; + passthru = { + inherit langC langCC langObjC langObjCpp langFortran langGo version; + isGNU = true; + }; - inherit enableParallelBuilding enableMultilib; + enableParallelBuilding = true; + inherit enableMultilib; inherit (stdenv) is64bit; @@ -428,6 +429,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.darwin; }; } |