Use prev. build linux compiler as default gcc to build native mingw64 compiler kitrefs/changes/62/10962/2

Change-Id: I6bd5cfce20085e02f499816a7ac0cfca124f0e9b
(cherry picked from commit 117f3357df54a334ebc135b3d6156e237673313e)

1 files changed, 17 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 002f053..ce33459 100644
--- a/Makefile
+++ b/Makefile
@@ -137,11 +137,7 @@ download: $(SOURCE_PACKAGES)
 _download_prepare:
 	mkdir -p $(SOURCE_DIR)
 
-all: 	\
-	lingcc-all	\
-	xgcc-all 	\
-	wingcc-all 	\
-	fullclean
+all: 	lingcc-all xgcc-all wingcc-all fullclean
 ifneq ($(LOCAL_INST_PATH),)
 	mkdir -p $(LOCAL_INST_PATH)
 	mkdir -p $(LOCAL_INST_PATH)/../x86-mingw64
@@ -333,6 +329,7 @@ xgcc-build-binutils:
 			--target=$(XGCC_TARGET64) ;\
 		make $(JOBS) ;\
 		make $(JOBS) install-strip
+	cd $(XGCC_INST_DIR)/bin && ln -s x86_64-w64-mingw32-windres windres
 
 xgcc-mingw-pass1: 
 	mkdir -p $(BUILD_DIR)/mingw
@@ -617,6 +614,7 @@ wingcc-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
 	cd $(BUILD_DIR)/binutils ;\
 	    export PATH=$(XGCC_BINPATH):$(PATH) && \
+	    export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \
 		CC=$(XGCC64) CXX=$(XGPP64) \
 		LDLAGS="-static-libgcc -static-libstdc++" \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
@@ -639,6 +637,7 @@ 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) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
@@ -660,6 +659,7 @@ 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) && \
 	LDLAGS="-m32 -static-libgcc -static-libstdc++" \
 	CFLAGS="-m32 -O2 -pipe" \
 	CXXFLAGS="-m32 -O2 -pipe" \
@@ -679,6 +679,7 @@ 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) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-libraries/winpthreads/configure \
@@ -693,6 +694,7 @@ 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) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
@@ -765,6 +767,7 @@ wingcc-reimp:
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/reimp.tar.gz
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(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
@@ -776,6 +779,7 @@ wingcc-gmake:
 	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) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 		./configure \
@@ -793,6 +797,7 @@ wingcc-genpeimg:
 	mkdir -p  $(BUILD_DIR)/genpeimg
 	cd $(BUILD_DIR)/genpeimg && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(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) && \
@@ -805,6 +810,7 @@ wingcc-gendef:
 	mkdir -p $(BUILD_DIR)/gendef && \
 	cd $(BUILD_DIR)/gendef && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(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) && \
@@ -816,6 +822,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) && \
 	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) \
@@ -828,6 +835,7 @@ wingcc-genlib:
 	mkdir -p $(BUILD_DIR)/genlib
 	cd $(BUILD_DIR)/genlib && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(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) \
@@ -842,6 +850,7 @@ wingcc-widl:
 	mkdir -p $(BUILD_DIR)/widl
 	cd $(BUILD_DIR)/widl && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(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) \
@@ -856,6 +865,7 @@ wingcc-zlib:
 	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) && \
 	CC=$(XGCC64) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
@@ -886,6 +896,7 @@ wingcc-zlib:
 wingcc-bzip2:
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(INST_BASE_LINUX)/gcc/bin:$(PATH) && \
 	make \
 		CC=$(XGCC64) \
 		PREFIX=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) libbz2.a
@@ -908,6 +919,7 @@ 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) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	CXXFLAGS="-g -O2 -fpermissive" \
 	CFLAGS="-g -O2" \