diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-18 13:54:09 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-23 14:28:59 -0400 |
| commit | 71186e73455a4e06e96a31da34b76f84e545ba1f (patch) | |
| tree | 090e55a75e5e37feb07527b9bcd4ed37bf095ef4 /pkgs/development/compilers/gcc/7 | |
| parent | 9884a3b17a817b4b5aee2ce01a10a08f98653a62 (diff) | |
| download | nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar.gz nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar.bz2 nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar.lz nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar.xz nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.tar.zst nixlib-71186e73455a4e06e96a31da34b76f84e545ba1f.zip | |
gcc: Use `configurePlatforms` to control --build, --host, and --target
Diffstat (limited to 'pkgs/development/compilers/gcc/7')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 67b7dee446fb..e1206c638f55 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -137,7 +137,6 @@ let version = "7.1.0"; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; in - "--target=${targetPlatform.config}" + withArch + withCpu + withAbi + @@ -328,6 +327,8 @@ stdenv.mkDerivation ({ dontDisableStatic = true; + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; configureFlags = " ${if hostPlatform.isSunOS then " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " + @@ -445,7 +446,6 @@ stdenv.mkDerivation ({ ) } ${if langAda then " --enable-libada" else ""} - --target=${targetPlatform.config} ${xwithArch} ${xwithCpu} ${xwithAbi} |