diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-05-19 11:12:19 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-05-19 11:12:19 +0200 |
| commit | 90c01001396e166fabfbcfb955de2a5409a95d9b (patch) | |
| tree | 14740d6dd534e4a642c4729fb6537407395aac42 /pkgs/development/compilers/gcc | |
| parent | fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6 (diff) | |
| parent | a0feedca8f042a7886a706cd9b58df06fa7272d8 (diff) | |
| download | nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar.gz nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar.bz2 nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar.lz nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar.xz nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.tar.zst nixlib-90c01001396e166fabfbcfb955de2a5409a95d9b.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/5/default.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index eceaef7bdc41..eeeabe301d13 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -63,10 +63,6 @@ let version = "5.5.0"; ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch - - # This could be applied unconditionally but I don't want to cause a full - # Linux rebuild. - ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch ++ optional stdenv.hostPlatform.isMusl (fetchpatch { url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; |