diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
| commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
| tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/development/compilers/gcc/5.1/libstdc++-target.patch | |
| parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
| parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
| download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc/5.1/libstdc++-target.patch')
| -rw-r--r-- | pkgs/development/compilers/gcc/5.1/libstdc++-target.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch new file mode 100644 index 000000000000..fb622b395806 --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/libstdc++-target.patch @@ -0,0 +1,32 @@ +Patch to make the target libraries 'configure' scripts find the proper CPP. +I noticed that building the mingw32 cross compiler. +Looking at the build script for mingw in archlinux, I think that only nixos +needs this patch. I don't know why. +diff --git a/Makefile.in b/Makefile.in +index 93f66b6..d691917 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ + AR="$(AR_FOR_TARGET)"; export AR; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ ++ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ +@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; ++ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ ++ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; + + # Where to find GMP + HOST_GMPLIBS = @gmplibs@ |