diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-10-29 19:17:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 19:17:28 +0000 |
commit | 4a854344b707378dba7c69a9881361ca3ed47ce8 (patch) | |
tree | 0e544776d23f47a5fe5b8a74f8dac730501a24a5 /pkgs/development/compilers/gcc/6 | |
parent | 1098abf4aff7f58257b0cca3edcabbec550cccdf (diff) | |
parent | 110f16e43ed4f246186e2ffa2f489a698a0b187c (diff) | |
download | nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.gz nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.bz2 nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.lz nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.xz nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.tar.zst nixpkgs-4a854344b707378dba7c69a9881361ca3ed47ce8.zip |
Merge pull request #48721 from oxij/tree/mass-rebuild-complicated-cleanups
treewide: mass rebuild complicated cleanups
Diffstat (limited to 'pkgs/development/compilers/gcc/6')
-rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index eeb57be9715..2980d34fcc4 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 = @@ -240,12 +238,9 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools]) - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) - ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) ; NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -258,8 +253,7 @@ stdenv.mkDerivation ({ '' + stdenv.lib.optionalString (langJava || langGo) '' export lib=$out; - '' - ; + ''; dontDisableStatic = true; @@ -386,7 +380,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) @@ -407,10 +402,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; @@ -434,6 +432,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ stdenv.lib.platforms.darwin; }; } |