diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 44 |
1 files changed, 15 insertions, 29 deletions
@@ -615,8 +615,7 @@ wingcc-all: wingcc-binutils: mkdir -p $(BUILD_DIR)/binutils cd $(BUILD_DIR)/binutils ;\ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \ @@ -638,8 +637,7 @@ wingcc-binutils: wingcc-mingw: rm -Rf $(BUILD_DIR)/mingw && mkdir -p $(BUILD_DIR)/mingw cd $(BUILD_DIR)/mingw && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \ @@ -660,8 +658,7 @@ wingcc-pthread: wingcc-pthread-32 wingcc-pthread-64 wingcc-pthread-32: rm -Rf $(BUILD_DIR)/winpthreads-32 && mkdir -p $(BUILD_DIR)/winpthreads-32 cd $(BUILD_DIR)/winpthreads-32 && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ LDLAGS="-m32 -static-libgcc -static-libstdc++" \ CFLAGS="-m32 -O2 -pipe" \ CXXFLAGS="-m32 -O2 -pipe" \ @@ -680,8 +677,7 @@ wingcc-pthread-32: wingcc-pthread-64: rm -Rf $(BUILD_DIR)/winpthreads-64 && mkdir -p $(BUILD_DIR)/winpthreads-64 cd $(BUILD_DIR)/winpthreads-64 && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ CC=$(XGCC64) CXX=$(XGPP64) \ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-libraries/winpthreads/configure \ @@ -695,8 +691,7 @@ wingcc-pthread-64: wingcc-gcc: rm -Rf $(BUILD_DIR)/gcc && mkdir -p $(BUILD_DIR)/gcc cd $(BUILD_DIR)/gcc && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) \ LDLAGS="-static-libgcc -static-libstdc++" \ $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \ @@ -768,8 +763,7 @@ wingcc-reimp: rm -Rf $(BUILD_DIR)/reimp cd $(BUILD_DIR)/ && \ tar -zxf $(SOURCE_DIR)/reimp.tar.gz - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ cd $(BUILD_DIR)/reimp/src && \ make CC=$(XGCC_TARGET64)-gcc cp -f $(BUILD_DIR)/reimp/src/reimp.exe $(WINGCC_INST_DIR)/bin/reimp.exe @@ -780,8 +774,7 @@ wingcc-gmake: cd $(BUILD_DIR)/ && \ tar -jxf $(SOURCE_DIR)/make-4.2.tar.bz2 cd $(BUILD_DIR)/make-4.2 && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ LDLAGS="-static-libgcc -static-libstdc++" \ CC=$(XGCC64) CXX=$(XGPP64) \ ./configure \ @@ -798,8 +791,7 @@ wingcc-genpeimg: rm -Rf $(BUILD_DIR)/genpeimg mkdir -p $(BUILD_DIR)/genpeimg cd $(BUILD_DIR)/genpeimg && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Werror=implicit-fallthrough=0"\ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/genpeimg/configure \ --host=$(XGCC_TARGET64) && \ @@ -811,8 +803,7 @@ wingcc-gendef: rm -Rf $(BUILD_DIR)/gendef mkdir -p $(BUILD_DIR)/gendef && \ cd $(BUILD_DIR)/gendef && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Wno-error=cast-function-type -Werror=implicit-fallthrough=0"\ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/gendef/configure \ --host=$(XGCC_TARGET64) && \ @@ -824,7 +815,7 @@ wingcc-genidl: mkdir -p $(BUILD_DIR)/genidl cd $(BUILD_DIR)/genidl && \ export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) CFLAGS="-O3 -g -Wno-error=cast-function-type -Werror=implicit-fallthrough=0"\ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/genidl/configure \ --prefix=$(WINGCC_INST_DIR) \ @@ -836,8 +827,7 @@ wingcc-genlib: rm -Rf $(BUILD_DIR)/genlib mkdir -p $(BUILD_DIR)/genlib cd $(BUILD_DIR)/genlib && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) CFLAGS="-O3 -g -Wno-error=cast-function-type -Werror=implicit-fallthrough=0"\ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/genlib/configure \ --prefix=$(WINGCC_INST_DIR) \ @@ -851,8 +841,7 @@ wingcc-widl: rm -Rf $(BUILD_DIR)/widl mkdir -p $(BUILD_DIR)/widl cd $(BUILD_DIR)/widl && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ ac_cv_func_malloc_0_nonnull=yes CC=$(XGCC64) CXX=$(XGPP64) CFLAGS="-O3 -g -Wno-error=cast-function-type -Werror=implicit-fallthrough=0"\ $(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-tools/widl/configure \ --prefix=$(WINGCC_INST_DIR) \ @@ -866,8 +855,7 @@ wingcc-zlib: cd $(BUILD_DIR) && tar -zxf $(SOURCE_DIR)/zlib-$(VERSION_ZLIB).tar.gz cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && patch -p1 < $(PATCHES_DIR)/zlib_ranlib.patch cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) \ AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \ RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \ @@ -897,8 +885,7 @@ wingcc-zlib: wingcc-bzip2: cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \ - export PATH=$(XGCC_BINPATH):$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ make \ CC=$(XGCC64) \ PREFIX=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) libbz2.a @@ -920,8 +907,7 @@ wingcc-bzip2: wingcc-gdb: rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb cd $(BUILD_DIR)/gdb && \ - export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc/bin:$(PATH) && \ - export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \ + export PATH=$(INST_BASE_LINUX)/gcc/bin:$(XGCC_BINPATH):$(PATH) && \ CC=$(XGCC64) CXX=$(XGPP64) \ CXXFLAGS="-g -O2 -fpermissive" \ CFLAGS="-g -O2" \ |