diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 13:45:43 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-05 13:52:20 -0500 |
| commit | 1fe9798ac23e9be70553ba20a37fc32aa4f98f7f (patch) | |
| tree | c1056d240d6c3fba4d052af80d2b9a85981c5f66 /pkgs/development/compilers/gcc/4.8 | |
| parent | 74cbb5796eef0469cc704bdcf6d271cc614bfd19 (diff) | |
| download | nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar.gz nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar.bz2 nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar.lz nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar.xz nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.tar.zst nixlib-1fe9798ac23e9be70553ba20a37fc32aa4f98f7f.zip | |
lib, gcc: No `inherit (platform) gcc;` in {host,build,target}Platform
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index aa2160f6db2e..15f8c1858f28 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -98,12 +98,12 @@ let version = "4.8.5"; /* Platform flags */ platformFlags = let - gccArch = targetPlatform.gcc.arch or null; - gccCpu = targetPlatform.gcc.cpu or null; - gccAbi = targetPlatform.gcc.abi or null; - gccFpu = targetPlatform.gcc.fpu or null; - gccFloat = targetPlatform.gcc.float or null; - gccMode = targetPlatform.gcc.mode or null; + 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; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; @@ -122,12 +122,12 @@ let version = "4.8.5"; crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem"; crossConfigureFlags = let - gccArch = targetPlatform.gcc.arch or null; - gccCpu = targetPlatform.gcc.cpu or null; - gccAbi = targetPlatform.gcc.abi or null; - gccFpu = targetPlatform.gcc.fpu or null; - gccFloat = targetPlatform.gcc.float or null; - gccMode = targetPlatform.gcc.mode or null; + 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; withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; |