diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:33:12 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-11 14:36:08 -0400 |
| commit | ee4b56edd364922c6a20a8d7b21a5a72497b4bc2 (patch) | |
| tree | 42bd2a09efe21aa446e411201d4974d39f8a8a4f /pkgs/development/compilers/gcc/7/default.nix | |
| parent | 73833ee4465369c9eead8e00ce699053e010de2f (diff) | |
| parent | 62ee7b7b4713c90048ec7063ca4f4cd7677eeb53 (diff) | |
| download | nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.gz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.bz2 nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.lz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.xz nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.tar.zst nixlib-ee4b56edd364922c6a20a8d7b21a5a72497b4bc2.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc/7/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index b5da4c8c7666..a86d87feb659 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -60,22 +60,6 @@ let version = "7.3.0"; }) ++ optional langFortran ../gfortran-driving.patch; - /* Platform flags */ - platformFlags = let - gccArch = targetPlatform.platform.gcc.arch or null; - gccCpu = targetPlatform.platform.gcc.cpu or null; - gccAbi = targetPlatform.platform.gcc.abi or null; - gccFpu = targetPlatform.platform.gcc.fpu or null; - gccFloat = targetPlatform.platform.gcc.float or null; - gccMode = targetPlatform.platform.gcc.mode or null; - in - optional (gccArch != null) "--with-arch=${gccArch}" ++ - optional (gccCpu != null) "--with-cpu=${gccCpu}" ++ - optional (gccAbi != null) "--with-abi=${gccAbi}" ++ - optional (gccFpu != null) "--with-fpu=${gccFpu}" ++ - optional (gccFloat != null) "--with-float=${gccFloat}" ++ - optional (gccMode != null) "--with-mode=${gccMode}"; - /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; @@ -337,7 +321,7 @@ stdenv.mkDerivation ({ # Optional features optional (isl != null) "--with-isl=${isl}" ++ - platformFlags ++ + (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ |