From c3ca8067d0024556d078e5d3a4e3de479f10d1b4 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Sun, 2 Dec 2018 20:37:49 +0100
Subject: Fixed Makefile to compile 32-Bit Compiler Suite

Change-Id: I3d2420b848f74790d36fb59d2dd639cda3d4ec4d
---
 Makefile.32 | 250 +++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 145 insertions(+), 105 deletions(-)

diff --git a/Makefile.32 b/Makefile.32
index 5f09e01..f4d3bfa 100755
--- a/Makefile.32
+++ b/Makefile.32
@@ -8,7 +8,6 @@
 #	all compiler including GDB
 #
 #	Languages:	C, C++, Fortran, Obj-C
-#	Multilib:	-m32, -m64
 #
 # host
 # 
@@ -43,8 +42,11 @@ VERSION_SUITE		= $(SUITE)-$(BUILD_NUMBER)
 endif
 
 TOP			= $(shell readlink -f .)
-ARCH 			= x86-linux
+PLATFORM32		= x86-linux
+PLATFORM64		= x86-linux64
+PLATFORM		= $(PLATFORM32)
 ARCH32			= i686-linux-gnu
+ARCH64			= x86_64-linux-gnu
 
 GCC_PKGVERSION		= "TechSAT GCC-Suite v$(VERSION_SUITE)"
 
@@ -52,28 +54,33 @@ XGCC_TARGET32		= i686-w64-mingw32
 
 SOURCE_DIR 		= $(shell readlink -f $(PWD)/SOURCES)
 PATCHES_DIR 		= $(shell readlink -f $(PWD)/PATCHES)
-UNPACK_DIR		= $(PWD)/unpack.$(ARCH)
-BUILD_DIR		= $(PWD)/build.$(ARCH)
-INST_BASE		= $(PWD)/inst.$(ARCH)
+UNPACK_DIR		= $(PWD)/unpack.$(PLATFORM)
+BUILD_DIR		= $(PWD)/build.$(PLATFORM)
 
-INST_BASE_LINUX		= $(PWD)/inst.x86-linux32
+INST_BASE_LINUX32	= $(PWD)/inst.$(PLATFORM32)
+INST_BASE_LINUX64	= $(PWD)/inst.$(PLATFORM64)
+INST_BASE		= $(INST_BASE_LINUX32)
 
-XGCC_INST_DIR		= $(INST_BASE_LINUX)/mingw32
+XGCC_INST_DIR		= $(INST_BASE_LINUX32)/mingw32
 XGCC_PREFIX		= $(XGCC_TARGET32)-
 XGCC_BINPATH		= $(XGCC_INST_DIR)/bin
-XGCC32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)gcc -m32 -static-libgcc"
-XGPP32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)g++ -m32 -static-libgcc -static-libstdc++"
+XGCC32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)gcc -m32 -march=i686 -static-libgcc"
+XGPP32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)g++ -m32 -march=i686 -static-libgcc -static-libstdc++"
+NXGCC32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)gcc -m32 -march=i686 "
+NXGPP32			= "$(XGCC_BINPATH)/$(XGCC_PREFIX)g++ -m32 -march=i686 "
 
-GCC_BINPATH		= $(INST_BASE)/gcc-$(VERSION_GCC)/bin
-GCC32			= "$(GCC_BINPATH)/gcc -static-libgcc"
-GXX32			= "$(GCC_BINPATH)/g++ -static-libgcc -static-libstdc++"
-GCC			= "$(GCC_BINPATH)/gcc -static-libgcc"
-GXX			= "$(GCC_BINPATH)/g++ -static-libgcc -static-libstdc++"
+GCC32_BINPATH		= $(INST_BASE_LINUX32)/gcc-$(VERSION_GCC)/bin
+GCC64_BINPATH		= $(INST_BASE_LINUX64)/gcc-$(VERSION_GCC)/bin
+GCC_BINPATH		= $(GCC32_BINPATH)
+GCC32			= "$(GCC_BINPATH)/gcc -m32 -static-libgcc"
+GXX32			= "$(GCC_BINPATH)/g++ -m32 -static-libgcc -static-libstdc++"
+GCC			= "$(GCC_BINPATH)/gcc -m32 -static-libgcc"
+GXX			= "$(GCC_BINPATH)/g++ -m32 -static-libgcc -static-libstdc++"
 
 
 WINGCC_ROOTNAME		= gcc-$(VERSION_GCC)
-WINGCC_INST_DIR		= $(INST_BASE)/$(WINGCC_ROOTNAME)
-WINGCC_SYSROOT		= $(INST_BASE)/$(WINGCC_ROOTNAME)
+WINGCC_INST_DIR		= $(PWD)/inst.x86-mingw32/$(WINGCC_ROOTNAME)
+WINGCC_SYSROOT		= $(WINGCC_INST_DIR)
 
 LANGUAGES		= c,c++,fortran,objc
 
@@ -140,7 +147,7 @@ ifneq ($(LOCAL_INST_PATH),)
 	cd $(LOCAL_INST_PATH); \
 	tar -zxf $(PWD)/gcc-suite-$(VERSION_SUITE)-xgcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-linux.tgz
 	cd $(LOCAL_INST_PATH)/../x86-mingw32; \
-	unzip -o $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-mingw.zip
+	unzip -o $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-mingw32.zip
 endif
 
 prepare:
@@ -189,10 +196,12 @@ lingcc-all:
 
 lingcc-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
+	mkdir -p $(INST_BASE_LINUX32)/gcc-$(VERSION_GCC)/bin
 	cd $(BUILD_DIR)/binutils ;\
-	export CFLAGS="-m32" && \
-	export CXXLAGS="-m32" && \
+		export PATH=$(INST_BASE_LINUX64)/gcc-$(VERSION_GCC)/bin:$(PATH):$(INST_BASE_LINUX32)/gcc-$(VERSION_GCC)/bin && \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
+			CFLAGS="-m32" \
+			CXXLAGS="-m32" \
 			--with-pkgversion=$(GCC_PKGVERSION) \
 			--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
 			--disable-nls \
@@ -201,27 +210,35 @@ lingcc-binutils:
 			--with-gnu-ld \
 			--with-gnu-as \
 			--disable-werror \
-			--build=$(ARCH32) \
 			--host=$(ARCH32) \
-			--enable-targets=$(ARCH32) && \
+			--build=$(ARCH32) \
+			--enable-targets=$(ARCH32) ; \
 		make $(JOBS) && make $(JOBS) install-strip
-
+	cd $(INST_BASE)/gcc-$(VERSION_GCC)/bin && \
+		for f in addr2line ar as c++filt elfedit gprof ld ld.bfd nm objcopy objdump ranlib readelf size strings strip ; do \
+			if [ -f $$f ]; then \
+				if [ -e $(ARCH32)-$$f ]; then \
+					rm -f $(ARCH32)-$$f ; \
+				fi; \
+				ln -s $$f $(ARCH32)-$$f ; \
+			fi; \
+		done;
 
 lingcc-gcc:
 	mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
-	export CC="gcc -m32" && \
-	export CXX="g++ -m32" && \
-	export CFLAGS="-m32" && \
-	export CXXLAGS="-m32" && \
-	export LDLAGS="-m32" && \
-	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
-		--with-pkgversion=$(GCC_PKGVERSION) \
-		--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
-		--build=$(ARCH32) \
+	    export PATH=$(PATH):$(INST_BASE_LINUX32)/gcc-$(VERSION_GCC)/bin && \
+	    gcc --version && \
+	    CC="gcc -m32" CXX="g++ -m32" CFLAGS="-O2 -march=i686" CXXFLAGS="-O2 -march=i686" $(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
 		--host=$(ARCH32) \
+		--build=$(ARCH32) \
 		--target=$(ARCH32) \
+		--with-sysroot=/ \
+		--enable-threads=posix  \
+		--with-pkgversion=$(GCC_PKGVERSION) \
+		--prefix=$(INST_BASE)/gcc-$(VERSION_GCC) \
 		--disable-nls \
+		--disable-assembly \
 		--disable-multilib \
 		--with-arch-32=i686 \
 		--with-tune=generic\
@@ -242,6 +259,7 @@ lingcc-gcc:
 		--enable-gnu-unique-object \
 		--disable-vtable-verify \
 		--enable-clocale=gnu \
+		--disable-default-pie \
 		&& \
 	make $(JOBS) all && \
 	make $(JOBS) install-strip
@@ -258,7 +276,9 @@ lingcc-gdb:
 	mkdir -p $(BUILD_DIR)/lingdb
 	cd $(BUILD_DIR)/lingdb && \
 	export PATH=$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
-	CFLAGS="-m32 -g -O2" \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="-g -O2" \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CXXFLAGS="-g -O2 -fpermissive" \
 	$(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \
@@ -278,31 +298,32 @@ lingcc-pack:
 # Linux based MinGW multilib cross compiler
 ##############################################################################
 xgcc-all:
-	make clean
-	make prepare
-	#
-	make build-common
-	make xgcc-build-binutils
-	make xgcc-mingw-pass1
-	make xgcc-gcc-pass1
-	make xgcc-mingw-pass2
-	make xgcc-gcc-pass2
-	make xgcc-finish
-	make xgcc-gdb
-	make xgcc-zlib
-	make xgcc-bzip2
-	make xgcc-reimp
-	make xgcc-genpeimg
-	make xgcc-gendef
-	make xgcc-pack
+	make -f Makefile.32 clean
+	make -f Makefile.32 prepare
+	make -f Makefile.32 build-common
+	make -f Makefile.32 xgcc-build-binutils
+	make -f Makefile.32 xgcc-mingw-pass1
+	make -f Makefile.32 xgcc-gcc-pass1
+	make -f Makefile.32 xgcc-mingw-pass2
+	make -f Makefile.32 xgcc-gcc-pass2
+	make -f Makefile.32 xgcc-finish
+	make -f Makefile.32 xgcc-gdb
+	make -f Makefile.32 xgcc-zlib
+	make -f Makefile.32 xgcc-bzip2
+	make -f Makefile.32 xgcc-reimp
+	make -f Makefile.32 xgcc-genpeimg
+	make -f Makefile.32 xgcc-gendef
+	make -f Makefile.32 xgcc-pack
 
 xgcc-build-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
 	cd $(BUILD_DIR)/binutils ;\
-		LDLAGS="-static-libgcc -static-libstdc++" \
-		CFLAGS="-m32 -O2 -pipe" \
-		CXXFLAGS="-m32 -O2 -pipe" \
 		$(UNPACK_DIR)/binutils-$(VERSION_BINUTILS)/configure \
+			LDLAGS="-static-libgcc -static-libstdc++" \
+			CC="gcc -m32" \
+			CXX="g++ -m32" \
+			CFLAGS="-O2 -pipe" \
+			CXXFLAGS="-O2 -pipe" \
 			--with-pkgversion=$(GCC_PKGVERSION) \
 			--prefix=$(XGCC_INST_DIR) \
 			--disable-nls \
@@ -321,10 +342,12 @@ xgcc-build-binutils:
 xgcc-mingw-pass1: 
 	mkdir -p $(BUILD_DIR)/mingw
 	cd $(BUILD_DIR)/mingw ;\
-	LDLAGS="-static-libgcc -static-libstdc++" \
-	CFLAGS="-m32 -O2 -pipe" \
-	CXXFLAGS="-m32 -O2 -pipe" \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/mingw-w64-headers/configure \
+		CC="gcc -m32" \
+		CXX="g++ -m32" \
+		LDLAGS="-static-libgcc -static-libstdc++" \
+		CFLAGS="-O2 -pipe" \
+		CXXFLAGS="-O2 -pipe" \
 		--prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET32) \
 		--host=$(XGCC_TARGET32) ;\
 	make $(JOBS) install
@@ -333,10 +356,12 @@ xgcc-mingw-pass1:
 xgcc-gcc-pass1: 
 	mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
-	LDLAGS="-static-libgcc -static-libstdc++" \
-	CFLAGS="-m32 -O2 -pipe" \
-	CXXFLAGS="-m32 -O2 -pipe" \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
+		CC="gcc -m32" \
+		CXX="g++ -m32" \
+		LDLAGS="-static-libgcc -static-libstdc++" \
+		CFLAGS="-O2 -pipe" \
+		CXXFLAGS="-O2 -pipe" \
 		--with-pkgversion=$(GCC_PKGVERSION) \
 		--prefix=$(XGCC_INST_DIR) \
 		--with-sysroot=$(XGCC_INST_DIR) \
@@ -365,12 +390,13 @@ xgcc-gcc-pass1:
 xgcc-mingw-pass2: 
 	cd $(BUILD_DIR)/mingw && \
 	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
-	LDLAGS="-static-libgcc -static-libstdc++" \
-	CFLAGS="-m32 -O2 -pipe" \
-	CXXFLAGS="-m32 -O2 -pipe" \
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
+		LDLAGS="-static-libgcc -static-libstdc++" \
+		CFLAGS="-m32 -O2 -pipe" \
+		CXXFLAGS="-m32 -O2 -pipe" \
 		--prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET32) \
 		--host=$(XGCC_TARGET32) \
+		--build=$(ARCH32) \
 		--disable-nls \
 		--enable-sdk=all \
 		--enable-idl \
@@ -387,6 +413,8 @@ xgcc-gcc-pass2:
 
 
 xgcc-finish:
+	rm -f $(XGCC_INST_DIR)/i686-w64-mingw32/lib/libgcc_s.a
+	cd $(XGCC_INST_DIR)/i686-w64-mingw32/lib && ln -s ../../lib/gcc/i686-w64-mingw32/lib/libgcc_s.a
 	cd $(XGCC_INST_DIR) && rm -f mingw 
 	for f in `find $(XGCC_INST_DIR) -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary' | cut -d: -f1`; do \
 			$(XGCC_INST_DIR)/bin/$(XGCC_TARGET32)-strip $$f ;\
@@ -414,10 +442,10 @@ xgcc-gdb:
 	rm -rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
 	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
-	LDLAGS="-static-libgcc -static-libstdc++" \
-	CFLAGS="-m32 -O2 -pipe" \
-	CXXFLAGS="-m32 -O2 -pipe -fpermissive" \
 	$(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \
+		LDLAGS="-m32 -static-libgcc -static-libstdc++" \
+		CFLAGS="-m32 -O2 -pipe" \
+		CXXFLAGS="-O2 -pipe -fpermissive" \
 		--prefix=$(XGCC_INST_DIR) \
 		--target=$(XGCC_TARGET32) \
 		--build=$(ARCH32) \
@@ -481,8 +509,8 @@ xgcc-zlib:
 		--prefix=$(XGCC_INST_DIR)/$(XGCC_TARGET32) --static && \
 	make clean && make 
 	cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \
-	cp -f libz.a $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib32 && \
-	chmod 644  $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib32/libz.a
+	cp -f libz.a $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib && \
+	chmod 644  $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib/libz.a
 
 xgcc-bzip2:
 	mkdir -p $(BUILD_DIR)
@@ -492,32 +520,33 @@ xgcc-bzip2:
 		CC=$(XGCC32) \
 		PREFIX=$(XGCC_INST_DIR)/$(XGCC_TARGET32) clean libbz2.a
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
+		cp -f bzlib.h $(XGCC_INST_DIR)/$(XGCC_TARGET32)/include && \
 		cp -f libbz2.a $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib
 	chmod 644 $(XGCC_INST_DIR)/$(XGCC_TARGET32)/lib/libbz2.a
 
 xgcc-pack:
 	rm -Rf $(XGCC_INST_DIR)/share
-	cd $(INST_BASE_LINUX) && \
-		tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-xgcc-$(VERSION_GCC)-$(VERSION_MINGW)-$(ARCH).tgz ./mingw32
+	cd $(XGCC_INST_DIR)/.. && \
+		tar -zcf $(PWD)/gcc-suite-$(VERSION_SUITE)-xgcc-$(VERSION_GCC)-$(VERSION_MINGW)-$(PLATFORM).tgz ./mingw32
 
 ##############################################################################
 # Nativ Windows Compiler (32 -Bit)
 ##############################################################################
 wingcc-all:
-	make -f Makefile.32 ARCH=x86-mingw32 clean
-	make -f Makefile.32 ARCH=x86-mingw32 prepare
+	make PLATFORM=x86-mingw32 -f Makefile.32 clean
+	make PLATFORM=x86-mingw32 -f Makefile.32 prepare
 	#
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-binutils
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-mingw
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-gcc
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-finish
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-zlib
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-bzip2
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-gendef
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-genpeimg
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-reimp
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-gdb
-	make -f Makefile.32 ARCH=x86-mingw32 wingcc-pack
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-binutils
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-mingw
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-gcc
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-finish
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-zlib
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-bzip2
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-gendef
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-genpeimg
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-reimp
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-gdb
+	make PLATFORM=x86-mingw32 -f Makefile.32 wingcc-pack
 
 wingcc-binutils:
 	mkdir -p $(BUILD_DIR)/binutils
@@ -536,9 +565,19 @@ wingcc-binutils:
 			--disable-werror \
 			--disable-rpath \
 			--enable-targets=$(XGCC_TARGET32) \
+			--build=$(ARCH32) \
 			--host=$(XGCC_TARGET32) \
 			--target=$(XGCC_TARGET32) &&\
 		make $(JOBS) && make $(JOBS) install-strip
+	cd $(WINGCC_INST_DIR)/bin && \
+		for f in addr2line.exe as.exe dlltool.exe elfedit.exe ld.bfd.exe nm.exe objdump.exe readelf.exe strings.exe windmc.exe ar.exe c++filt.exe dllwrap.exe gprof.exe ld.exe objcopy.exe ranlib.exe size.exe strip.exe windres.exe ; do \
+			if [ -f $$f ]; then \
+				if [ -e $(XGCC_TARGET32)-$$f ]; then \
+					rm -f $(XGCC_TARGET32)-$$f ; \
+				fi; \
+				cp -f $$f $(XGCC_TARGET32)-$$f ; \
+			fi; \
+		done;
 
 wingcc-mingw:
 	rm -Rf $(BUILD_DIR)/mingw && mkdir -p $(BUILD_DIR)/mingw
@@ -548,6 +587,8 @@ wingcc-mingw:
 	$(UNPACK_DIR)/mingw-w64-v$(VERSION_MINGW)/configure \
 		--prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET32) \
 		--host=$(XGCC_TARGET32) \
+		--target=$(XGCC_TARGET32) \
+		--build=$(ARCH32) \
 		--disable-nls \
 		--enable-sdk=all \
 		--enable-idl \
@@ -562,22 +603,20 @@ wingcc-gcc:
 	rm -Rf $(BUILD_DIR)/gcc && mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
 	export PATH=$(XGCC_BINPATH):$(PATH) && \
-	CC=$(XGCC32) CXX=$(XGPP32) \
+	gcc -v && \
 	$(UNPACK_DIR)/gcc-$(VERSION_GCC)/configure \
 		--with-pkgversion=$(GCC_PKGVERSION) \
 		--prefix=$(WINGCC_INST_DIR) \
 		--with-sysroot=$(WINGCC_INST_DIR) \
 		--disable-nls \
+		--build=$(ARCH64) \
 		--host=$(XGCC_TARGET32) \
 		--target=$(XGCC_TARGET32) \
-		--build=$(ARCH32) \
 		--enable-languages=$(LANGUAGES) \
 		--with-gcc \
 		--with-gnu-ld \
 		--with-gnu-as \
 		--without-x \
-		--enable-shared \
-		--with-tune-64=core2 \
 		--disable-werror \
 		--disable-win32-registry \
 		--disable-symvers \
@@ -621,7 +660,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=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	cd $(BUILD_DIR)/reimp/src && \
 		make CC="$(XGCC_TARGET32)-gcc -m32"
 	cp -f $(BUILD_DIR)/reimp/src/reimp.exe $(WINGCC_INST_DIR)/bin/reimp.exe
@@ -632,7 +671,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=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC32) CXX=$(XGPP32) \
 		./configure \
 			CFLAGS="-I../glob" \
@@ -648,7 +687,7 @@ wingcc-genpeimg:
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/genpeimg.tar.gz
 	cd $(BUILD_DIR)/genpeimg && \
-	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC32) CXX=$(XGPP32) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Werror=implicit-fallthrough=0"\
 		./configure \
 			--host=$(XGCC_TARGET32) && \
@@ -663,7 +702,7 @@ wingcc-gendef:
 	cd $(BUILD_DIR)/ && \
 	tar -zxf $(SOURCE_DIR)/gendef.tar.gz
 	cd $(BUILD_DIR)/gendef && \
-	export PATH=$(XGCC_BINPATH):$(PATH) && \
+	export PATH=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC32) CXX=$(XGPP32) genpeimg_CFLAGS="" CFLAGS="-O3 -g -Wno-error=cast-function-type -Werror=implicit-fallthrough=0"\
 		./configure \
 			--host=$(XGCC_TARGET32) && \
@@ -677,52 +716,53 @@ 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=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	CC=$(XGCC32) \
 	AR=$(XGCC_BINPATH)/$(XGCC_PREFIX)ar \
 	RANLIB=$(XGCC_BINPATH)/$(XGCC_PREFIX)ranlib \
 	./configure \
-		--prefix=$(WINGCC_INST_DIR)/$(XGCC_TARGET32) --static && \
+		--prefix=$(WINGCC_INST_DIR) --static && \
 	make clean && make 
 	#
 	cd $(BUILD_DIR)/zlib-$(VERSION_ZLIB) && \
-	    cp -f libz.a $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/lib && \
-	    cp -f zlib.h zconf.h $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/include
+	    cp -f libz.a $(WINGCC_INST_DIR)/lib && \
+	    cp -f zlib.h zconf.h $(WINGCC_INST_DIR)/include
 	#
-	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/lib/libz.a
-	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/include/zlib.h 
-	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/include/zconf.h
+	chmod 644 $(WINGCC_INST_DIR)/lib/libz.a
+	chmod 644 $(WINGCC_INST_DIR)/include/zlib.h 
+	chmod 644 $(WINGCC_INST_DIR)/include/zconf.h
 
 wingcc-bzip2:
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-	export PATH=$(XGCC_BINPATH)/bin:$(PATH) && \
+	export PATH=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	make \
 		CC=$(XGCC32) \
-		PREFIX=$(WINGCC_INST_DIR)/$(XGCC_TARGET32) libbz2.a
+		PREFIX=$(WINGCC_INST_DIR) libbz2.a
 	cd $(UNPACK_DIR)/bzip2-$(VERSION_BZ2) && \
-		cp -f libbz2.a $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/lib32
-	chmod 644 $(WINGCC_INST_DIR)/$(XGCC_TARGET32)/lib/libbz2.a
+		cp -f bzlib.h $(WINGCC_INST_DIR)/include && \
+		cp -f libbz2.a $(WINGCC_INST_DIR)/lib 
+	chmod 644 $(WINGCC_INST_DIR)/lib/libbz2.a
 
 wingcc-gdb: 
 	rm -Rf $(BUILD_DIR)/gdb && mkdir -p $(BUILD_DIR)/gdb
 	cd $(BUILD_DIR)/gdb && \
-	export PATH=$(XGCC_BINPATH):$(INST_BASE)/gcc-$(VERSION_GCC)/bin:$(PATH) && \
-	CC=$(XGCC32) CXX=$(XGPP32) \
+	export PATH=$(PWD)/inst.x86-linux/gcc-$(VERSION_GCC)/bin:$(XGCC_BINPATH):$(PATH) && \
 	CXXFLAGS="-m32 -g -O2 -fpermissive" \
 	CFLAGS="-m32 -g -O2" \
+	CC=$(XGCC32) CXX=$(XGPP32) \
 	$(UNPACK_DIR)/gdb-$(VERSION_GDB)/configure \
 		--prefix=$(WINGCC_INST_DIR) \
 		--target=$(XGCC_TARGET32) \
 		--host=$(XGCC_TARGET32) \
 		--build=$(ARCH32) && \
 	make $(JOBS) && make $(JOBS) install
-	mv -f $(WINGCC_INST_DIR)/bin/gdb.exe \
+	cp -f $(WINGCC_INST_DIR)/bin/gdb.exe \
 		$(WINGCC_INST_DIR)/bin/$(XGCC_TARGET32)-gdb.exe
-	mv -f $(WINGCC_INST_DIR)/bin/gdbserver.exe \
+	cp -f $(WINGCC_INST_DIR)/bin/gdbserver.exe \
 		$(WINGCC_INST_DIR)/bin/$(XGCC_TARGET32)-gdbserver.exe
 wingcc-pack:
 	rm -Rf $(WINGCC_INST_DIR)/share
-	cd $(INST_BASE) && \
+	cd $(WINGCC_INST_DIR)/.. && \
 		zip -qr $(PWD)/gcc-suite-$(VERSION_SUITE)-gcc-$(VERSION_GCC)-$(VERSION_MINGW)-x86-mingw32.zip ./$(WINGCC_ROOTNAME)
 # ----------------------------------------------------------------------------
 
-- 
cgit v0.12