summary refs log tree commit diff
path: root/pkgs/development/compilers/gcc/6/default.nix
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-04-06 23:20:35 -0400
committerDan Peebles <pumpkin@me.com>2017-04-06 23:20:35 -0400
commit0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3 (patch)
treedd9a368349c92c1272720c211df62349c7072d64 /pkgs/development/compilers/gcc/6/default.nix
parent6f0a2af5bccc4f53ae1874ad9aa6103c8cb752f3 (diff)
downloadnixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar.gz
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar.bz2
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar.lz
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar.xz
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.tar.zst
nixpkgs-0cacae6a5f283ccc1fee8ea718d7e4bb87e6c0a3.zip
gcc6: fix for LLVM 4.0
Diffstat (limited to 'pkgs/development/compilers/gcc/6/default.nix')
-rw-r--r--pkgs/development/compilers/gcc/6/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index c6fac16a76c..b4e588f6b14 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -73,7 +73,8 @@ let version = "6.3.0";
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
-      ++ optional langFortran ../gfortran-driving.patch;
+      ++ optional langFortran ../gfortran-driving.patch
+      ++ optional stdenv.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at