diff options
| -rwxr-xr-x | Makefile | 34 |
1 files changed, 20 insertions, 14 deletions
@@ -268,8 +268,9 @@ lingcc-gdb: mkdir -p $(BUILD_DIR)/lingdb cd $(BUILD_DIR)/lingdb && \ export PATH=$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \ - CFLAGS="-g -O2 -static-libgcc" \ - CXXFLAGS="-g -O2 -static-libgcc -static-libstdc++ -fpermissive" \ + CFLAGS="-g -O2" \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CXXFLAGS="-g -O2 -fpermissive" \ $(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \ --prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \ --target=$(ARCH64) \ @@ -308,8 +309,9 @@ xgcc-all: xgcc-build-binutils: mkdir -p $(BUILD_DIR)/binutils cd $(BUILD_DIR)/binutils ;\ - CFLAGS="-O2 -pipe -static-libgcc" \ - CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++" \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CFLAGS="-O2 -pipe" \ + CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \ --with-pkgversion=$(GCC_PKGVERSION) \ --prefix=$(XGCC_INST_DIR) \ @@ -329,8 +331,9 @@ xgcc-build-binutils: xgcc-mingw-pass1: mkdir -p $(BUILD_DIR)/mingw cd $(BUILD_DIR)/mingw ;\ - CFLAGS="-O2 -pipe -static-libgcc" \ - CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++" \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CFLAGS="-O2 -pipe" \ + CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-headers/configure \ --prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET64) \ --host=$(XGCC_TARGET64) ;\ @@ -342,8 +345,9 @@ xgcc-mingw-pass1: xgcc-gcc-pass1: mkdir -p $(BUILD_DIR)/gcc cd $(BUILD_DIR)/gcc && \ - CFLAGS="-O2 -pipe -static-libgcc" \ - CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++" \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CFLAGS="-O2 -pipe" \ + CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \ --with-pkgversion=$(GCC_PKGVERSION) \ --prefix=$(XGCC_INST_DIR) \ @@ -374,8 +378,9 @@ xgcc-gcc-pass1: xgcc-mingw-pass2: cd $(BUILD_DIR)/mingw && \ export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \ - CFLAGS="-O2 -pipe -static-libgcc" \ - CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++" \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CFLAGS="-O2 -pipe" \ + CXXFLAGS="-O2 -pipe" \ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \ --prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET64) \ --host=$(XGCC_TARGET64) \ @@ -423,9 +428,10 @@ xgcc-finish: xgcc-gdb: rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb cd $(BUILD_DIR)/gdb && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - CFLAGS="-O2 -pipe -static-libgcc" \ - CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++ -fpermissive" \ + export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \ + LDLAGS="-static-libgcc -static-libstdc++" \ + CFLAGS="-O2 -pipe" \ + CXXFLAGS="-O2 -pipe -fpermissive" \ $(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \ --prefix=$(XGCC_INST_DIR) \ --target=$(XGCC_TARGET64) \ @@ -743,7 +749,7 @@ wingcc-bzip2: wingcc-gdb: rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb cd $(BUILD_DIR)/gdb && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ + export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) \ CXXFLAGS="-g -O2 -fpermissive" \ CFLAGS="-g -O2" \ |