diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-04 17:28:32 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 17:30:32 +0000 |
| commit | 1abf1971cde752357fd9537dd963886c83fd8c03 (patch) | |
| tree | 6d8f486620e58e4db5ca8a14a7b37266dd1d0736 /pkgs/development/compilers/gcc | |
| parent | b14db1b0baea19934313ee90b56b157315ab328b (diff) | |
| download | nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar.gz nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar.bz2 nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar.lz nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar.xz nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.tar.zst nixlib-1abf1971cde752357fd9537dd963886c83fd8c03.zip | |
gcc7: cleanup with a mass rebuild
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index bb8a3638b2db..e2c686b7e7e8 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -217,9 +217,7 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) ; - # TODO: Use optionalString with next rebuild. - ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument"; - + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' |