diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 17:13:52 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 18:00:57 -0400 |
| commit | c9f6a82b619675a4ee1eb4fe9eac57efb69232fe (patch) | |
| tree | 8c18c4bf5cd3217072dcd82544e590c88a3da2aa /pkgs/development/compilers/gcc/6/default.nix | |
| parent | a02be2bd85b37ed8b257e969d9439357844baa24 (diff) | |
| download | nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar.gz nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar.bz2 nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar.lz nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar.xz nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.tar.zst nixpkgs-c9f6a82b619675a4ee1eb4fe9eac57efb69232fe.zip | |
gcc: Factor out "platform flags"
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/6/default.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3de5b4dd270..29f2bad7eac 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -97,22 +97,6 @@ let version = "6.4.0"; javaAwtGtk = langJava && x11Support; - /* 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"; @@ -400,7 +384,7 @@ stdenv.mkDerivation ({ # Ada optional langAda "--enable-libada" ++ - platformFlags ++ + (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++ optional (targetPlatform != hostPlatform) crossConfigureFlags ++ optional (!bootstrap) "--disable-bootstrap" ++ |