at master 1.5 kB view raw
1Patch to make the target libraries 'configure' scripts find the proper CPP. 2I noticed that building the mingw32 cross compiler. 3Looking at the build script for mingw in archlinux, I think that only nixos 4needs this patch. I don't know why. 5diff --git a/Makefile.in b/Makefile.in 6index 93f66b6..d691917 100644 7--- a/Makefile.in 8+++ b/Makefile.in 9@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \ 10 AR="$(AR_FOR_TARGET)"; export AR; \ 11 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ 12 CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ 13+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \ 14 CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ 15 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 16 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ 17@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \ 18 RAW_CXX_TARGET_EXPORTS = \ 19 $(BASE_TARGET_EXPORTS) \ 20 CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ 21- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; 22+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ 23+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; 24 25 NORMAL_TARGET_EXPORTS = \ 26 $(BASE_TARGET_EXPORTS) \ 27- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; 28+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \ 29+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX; 30 31 # Where to find GMP 32 HOST_GMPLIBS = @gmplibs@