diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 21:53:13 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-11-29 23:09:16 +0200 |
commit | aa3d195a304360a79a0dd639037a92118a62f539 (patch) | |
tree | f123e72dd0eadecc4fdad06cf24e3acc1723d2e8 /pkgs/development/compilers/gcc/5 | |
parent | 0c9ba0e1491ec8a11771528482624ee1948c249e (diff) | |
download | nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar.gz nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar.bz2 nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar.lz nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar.xz nixlib-aa3d195a304360a79a0dd639037a92118a62f539.tar.zst nixlib-aa3d195a304360a79a0dd639037a92118a62f539.zip |
gcc5: Reduce diff to gcc6
Diffstat (limited to 'pkgs/development/compilers/gcc/5')
-rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index c9b49c0ede63..332dae95965f 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -110,7 +110,7 @@ let version = "5.5.0"; 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}" ++ @@ -201,8 +201,6 @@ stdenv.mkDerivation ({ inherit sha256; }; - hardeningDisable = [ "format" ]; - inherit patches; outputs = [ "out" "lib" "man" "info" ]; @@ -211,6 +209,8 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; + hardeningDisable = [ "format" ]; + # This should kill all the stdinc frameworks that gcc and friends like to # insert into default search paths. prePatch = stdenv.lib.optionalString hostPlatform.isDarwin '' @@ -356,9 +356,6 @@ stdenv.mkDerivation ({ }" ] ++ - # Optional features - optional (isl != null) "--with-isl=${isl}" ++ - (if enableMultilib then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ @@ -367,6 +364,9 @@ stdenv.mkDerivation ({ then ["--enable-plugin"] else ["--disable-plugin"]) ++ + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + # Java options optionals langJava [ "--with-ecj-jar=${javaEcj}" @@ -431,7 +431,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 = @@ -490,7 +490,7 @@ stdenv.mkDerivation ({ CPATH = makeSearchPathOutput "dev" "include" ([] ++ optional (zlib != null) zlib - ++ optionals langJava [ boehmgc ] + ++ optional langJava boehmgc ++ optionals javaAwtGtk xlibs ++ optionals javaAwtGtk [ gmp mpfr ] ++ optional (libpthread != null) libpthread |