From 3c83a77776de220cb4062cda6b2d1150561c04f4 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Sun, 26 May 2019 00:34:21 +0200
Subject: Fixed location of libgcc_s.a

Change-Id: I617ab97cb0102afe6a5d756ded009e2e3e1df755
---
 Makefile    | 14 ++++++++++++--
 Makefile.32 |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c80d59d..bdba6b5 100755
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 #
 #	all compiler including GDB 7.12
 #
-#	Languages:	C, C++, Fortran, Obj-C
+#	Languages:	C, C++, Fortran, Obj-C, go, D
 #	Multilib:	-m32, -m64
 #
 # host
@@ -81,7 +81,7 @@ WINGCC_ROOTNAME		= gcc-$(VERSION_GCC)
 WINGCC_INST_DIR		= $(INST_BASE)/$(WINGCC_ROOTNAME)
 WINGCC_SYSROOT		= $(INST_BASE)/$(WINGCC_ROOTNAME)
 
-LANGUAGES		= c,c++,fortran,objc
+LANGUAGES		= c,c++,fortran,d
 
 SOURCE_PACKAGES 	= \
 	$(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2	\
@@ -168,6 +168,9 @@ prepare:
 	tar --lzip -xf $(SOURCE_DIR)/gmp-$(VERSION_GMP).tar.lz -C $(UNPACK_DIR)/
 	tar -zxf $(SOURCE_DIR)/zlib-$(VERSION_ZLIB).tar.gz -C $(UNPACK_DIR)/
 	tar -zxf $(SOURCE_DIR)/bzip2-$(VERSION_BZ2).tar.gz -C $(UNPACK_DIR)/
+	tar -zxf $(SOURCE_DIR)/gdc-8.x.tgz -C $(UNPACK_DIR)/
+	cd $(UNPACK_DIR)/GDC-8/ && \
+	    bash ./setup-gcc.sh $(UNPACK_DIR)/gcc-$(VERSION_GCC)
 	#
 	rm -Rf $(UNPACK_DIR)/gcc-$(VERSION_GCC)/gmp
 	mv $(UNPACK_DIR)/gmp-$(VERSION_GMP) $(UNPACK_DIR)/gcc-$(VERSION_GCC)/gmp
@@ -320,6 +323,7 @@ xgcc-build-binutils:
 xgcc-mingw-pass1: 
 	mkdir -p $(BUILD_DIR)/mingw
 	cd $(BUILD_DIR)/mingw ;\
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe" \
@@ -334,6 +338,7 @@ xgcc-mingw-pass1:
 xgcc-gcc-pass1: 
 	mkdir -p $(BUILD_DIR)/gcc
 	cd $(BUILD_DIR)/gcc && \
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe" \
@@ -383,6 +388,7 @@ xgcc-mingw-pass2:
 	make $(JOBS) install
 
 xgcc-gcc-pass2: 
+	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	cd $(BUILD_DIR)/gcc && \
 	    make $(JOBS) && \
 	    make $(JOBS) install
@@ -642,6 +648,10 @@ wingcc-finish:
 	cat $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/specs \
 		$(SOURCE_DIR)/gcc.msvcr110.spec > \
 		$(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/msvcr110
+	cd $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC) && \
+	    ln -s ../../lib/libgcc_s.a
+	cd $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/32 && \
+	    ln -s ../../lib32/libgcc_s.a
 		
 wingcc-reimp:
 	rm -Rf $(BUILD_DIR)/reimp
diff --git a/Makefile.32 b/Makefile.32
index f4d3bfa..f93ee36 100755
--- a/Makefile.32
+++ b/Makefile.32
@@ -655,6 +655,9 @@ wingcc-finish:
 	cat $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET32)/$(VERSION_GCC)/specs \
 		$(SOURCE_DIR)/gcc.msvcr110.spec > \
 		$(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET32)/$(VERSION_GCC)/msvcr110
+	cd $(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET32)/$(VERSION_GCC)/ && \
+	    ln -s ../../lib/libgcc_s.a
+
 		
 wingcc-reimp:
 	rm -Rf $(BUILD_DIR)/reimp
-- 
cgit v0.12