diff options
| author | Danny Wilson <danny@decube.net> | 2014-04-03 19:01:43 +0200 |
|---|---|---|
| committer | Danny Wilson <danny@prime.vc> | 2015-11-16 17:20:11 +0100 |
| commit | fdb534f06e4614bab25f38c48db7c99ae13c2b15 (patch) | |
| tree | a1e83cb77b5086c0a36bbdaed687fbb858a8ab28 /pkgs | |
| parent | 546601cf4b02a9c0c9d47a577d7be9d285590c2d (diff) | |
| download | nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar.gz nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar.bz2 nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar.lz nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar.xz nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.tar.zst nixlib-fdb534f06e4614bab25f38c48db7c99ae13c2b15.zip | |
GCC 4.8 compiles on Illumos.
- Disable profiled bootstrap. - Add illumos meta platform.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ff1d388b6e23..22c4fc22c020 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -519,6 +519,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd ++ + stdenv.lib.platforms.illumos ++ optionals (langAda == false) stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38b954fdd1c2..8134b08f5f7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3890,7 +3890,7 @@ let inherit noSysDirs; # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); + profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); # When building `gcc.crossDrv' (a "Canadian cross", with host == target # and host != build), `cross' must be null but the cross-libc must still |