From c75756608d1d3fe2158da5b549fd63ba96ec1c36 Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Sun, 26 May 2019 00:41:03 +0200
Subject: Undo unwanted changes

Change-Id: Iee41c093ad5a348840f57caf9cb4bd8b4e96fd12
---
 Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index bdba6b5..a03c56d 100755
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 #
 #	all compiler including GDB 7.12
 #
-#	Languages:	C, C++, Fortran, Obj-C, go, D
+#	Languages:	C, C++, Fortran, Obj-C
 #	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,d
+LANGUAGES		= c,c++,fortran,objc
 
 SOURCE_PACKAGES 	= \
 	$(SOURCE_DIR)/binutils-$(VERSION_BINUTILS).tar.bz2	\
@@ -168,9 +168,6 @@ 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
@@ -323,7 +320,6 @@ 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" \
@@ -338,7 +334,6 @@ 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" \
@@ -371,7 +366,6 @@ xgcc-gcc-pass1:
 
 xgcc-mingw-pass2: 
 	cd $(BUILD_DIR)/mingw && \
-	export PATH=$(XGCC_INST_DIR)/bin:$(PATH) && \
 	LDLAGS="-static-libgcc -static-libstdc++" \
 	CFLAGS="-O2 -pipe" \
 	CXXFLAGS="-O2 -pipe" \
-- 
cgit v0.12