From 992f5072392953faea239f4f6ffcaea831723674 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <jck@techsat.com>
Date: Wed, 11 Oct 2017 13:25:01 +0200
Subject: Patch from tow (To build within 202238_TS-Base-Packages project)

Change-Id: Ib1d3ea13549acfb62776048f10564cce9abf45c9
---
 Makefile | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index a9a135c..c784bc1 100755
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,7 @@ xgcc-gcc-pass1:
 
 xgcc-mingw-pass2: 
 	cd $(BUILD_DIR)/mingw && \
-	export PATH=$(PATH):$(XGCC_INST_DIR)/bin && \
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	CFLAGS="-O2 -pipe -static-libgcc" \
 	CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++" \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
@@ -423,7 +423,7 @@ xgcc-finish:
 xgcc-gdb: 
 	rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CFLAGS="-O2 -pipe -static-libgcc" \
 	CXXFLAGS="-O2 -pipe -static-libgcc -static-libstdc++ -fpermissive" \
 	$(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \
@@ -445,25 +445,26 @@ xgcc-genpeimg:
 	rm -Rf $(BUILD_DIR)/genpeimg
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/genpeimg.tar.gz
-	export PATH=$(PATH):$(GCC_BINPATH) && \
+	export PATH=$(GCC_BINPATH):$(PATH) && \
 	CC=$(GCC) CXX=$(GXX) \
-	CFLAGS="-O2 -pipe -static-libgcc" \
 	cd $(BUILD_DIR)/genpeimg && \
 	    LDLAGS="-static-libgcc" \
+	    CFLAGS="-pipe -Werror=implicit-fallthrough=0" \
 		./configure && \
-	make CFLAGS="-static-libgcc"
+	make
 	cp -f $(BUILD_DIR)/genpeimg/genpeimg $(XGCC_INST_DIR)/bin/$(XGCC_TARGET64)-genpeimg
 
 xgcc-gendef:
 	rm -Rf $(BUILD_DIR)/gendef
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/gendef.tar.gz
-	export PATH=$(PATH):$(GCC_BINPATH) && \
+	export PATH=$(GCC_BINPATH):$(PATH) && \
 	CC=$(GCC) CXX=$(GXX) \
 	cd $(BUILD_DIR)/gendef && \
+	    CFLAGS="-pipe -Werror=implicit-fallthrough=0" \
 	    LDLAGS="-static-libgcc" \
 		./configure && \
-	make CFLAGS="-static-libgcc"
+	make
 	cp -f $(BUILD_DIR)/gendef/gendef $(XGCC_INST_DIR)/bin/$(XGCC_TARGET64)-gendef
 
 xgcc-zlib:
@@ -472,7 +473,7 @@ xgcc-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=$(PATH):$(XGCC_INST_DIR)/bin && \
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	CC=$(XGCC64) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
@@ -487,7 +488,7 @@ xgcc-zlib:
 	chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/include/zconf.h
 	#
 	cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \
-	export PATH=$(PATH):$(XGCC_INST_DIR)/bin && \
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	CC=$(XGCC32) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
@@ -501,7 +502,7 @@ xgcc-zlib:
 xgcc-bzip2:
 	mkdir -p $(BUILD_DIR)
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	make \
 		CC=$(XGCC64) \
 		PREFIX=$(XGCC_INST_DIR)/$(XGCC_TARGET64) clean libbz2.a
@@ -512,7 +513,7 @@ xgcc-bzip2:
 	chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a
 	#	
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-	export PATH=$(PATH):$(XGCC_BINPATH)/bin && \
+	export PATH=$(XGCC_BINPATH)/bin:$(PATH) && \
 	make \
 		CC=$(XGCC32) \
 		PREFIX=$(XGCC_INST_DIR)/$(XGCC_TARGET64) clean libbz2.a
@@ -547,7 +548,7 @@ wingcc-all:
 wingcc-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
 	cd $(BUILD_DIR)/binutils ;\
-		export PATH=$(PATH):$(XGCC_BINPATH) && \
+	    export PATH=$(XGCC_BINPATH):$(PATH) && \
 		CC=$(XGCC64) CXX=$(XGPP64) \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
 			--with-pkgversion=$(GCC_PKGVERSION) \
@@ -568,7 +569,7 @@ wingcc-binutils:
 wingcc-mingw:
 	rm -Rf $(BUILD_DIR)/mingw && mkdir -p $(BUILD_DIR)/mingw
 	cd $(BUILD_DIR)/mingw && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
 		--prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) \
@@ -586,7 +587,7 @@ wingcc-mingw:
 wingcc-gcc:
 	rm -Rf $(BUILD_DIR)/gcc && mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
 		--with-pkgversion=$(GCC_PKGVERSION) \
@@ -650,7 +651,7 @@ wingcc-reimp:
 	rm -Rf $(BUILD_DIR)/reimp
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/reimp.tar.gz
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(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
@@ -661,7 +662,7 @@ wingcc-genpeimg:
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/genpeimg.tar.gz
 	cd $(BUILD_DIR)/genpeimg && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Werror=implicit-fallthrough=0"\
 		./configure \
 			--host=$(XGCC_TARGET64) && \
@@ -676,7 +677,7 @@ wingcc-gendef:
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/gendef.tar.gz
 	cd $(BUILD_DIR)/gendef && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Werror=implicit-fallthrough=0"\
 		./configure \
 			--host=$(XGCC_TARGET64) && \
@@ -690,7 +691,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=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
@@ -707,7 +708,7 @@ wingcc-zlib:
 	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/include/zconf.h
 	#
 	cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC32) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
@@ -720,7 +721,7 @@ wingcc-zlib:
 
 wingcc-bzip2:
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	make \
 		CC=$(XGCC64) \
 		PREFIX=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) libbz2.a
@@ -731,7 +732,7 @@ wingcc-bzip2:
 	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET64)/lib/libbz2.a
 	#	
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-	export PATH=$(PATH):$(XGCC_BINPATH)/bin && \
+	export PATH=$(XGCC_BINPATH)/bin:$(PATH) && \
 	make \
 		CC=$(XGCC32) \
 		PREFIX=$(WINGCC_INST_DIR)/$(XGCC_TARGET64) libbz2.a
@@ -742,7 +743,7 @@ wingcc-bzip2:
 wingcc-gdb: 
 	rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
-	export PATH=$(PATH):$(XGCC_BINPATH) && \
+	export PATH=$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC64) CXX=$(XGPP64) \
 	CXXFLAGS="-g -O2 -fpermissive" \
 	CFLAGS="-g -O2" \
-- 
cgit v0.12