From 72bbe30604bce235e5714e18620ed4580209ae65 Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Mon, 25 May 2020 13:50:06 +0200
Subject: Use INSTALLDIR as base install folder; used by TS_BasePkgs

Change-Id: Ie4632f8ba4417e881f71cde143d9970467dd5602
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 57f6e31..e6dd8b3 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,9 @@ INST_BASE		= $(PWD)/inst.$(ARCH)
 
 SUITEDIR		= /opt/dev-tools/gcc-suite
 
-INST_BASE_LINUX		= $(PWD)/inst.x86-linux64
+INSTALLDIR		?= $(TOP)
+
+INST_BASE_LINUX		= $(INSTALLDIR)/inst.x86-linux64
 
 XGCC_INST_DIR		= $(INST_BASE_LINUX)/mingw64
 XGCC_PREFIX		= $(XGCC_TARGET64)-
@@ -739,9 +741,8 @@ wingcc-finish:
 	find $(WINGCC_INST_DIR) -type f -name "*.py" | xargs rm -f
 	cd $(WINGCC_INST_DIR) && rm -Rf share 
 	cd $(WINGCC_INST_DIR) && rm -f mingw 
-	# x86_64-w64-mingw32-gdb-add-index.exe is a script and causes strip to fail
 	cd $(WINGCC_INST_DIR) ;\
-		find . -type f -name "*.exe" | xargs $(XGCC_BINPATH)/$(XGCC_PREFIX)strip
+		find . -type f -name "*.exe" | xargs $(XGCC_BINPATH)/$(XGCC_PREFIX)strip; true
 	#
 	cp -f $(SOURCE_DIR)/mingw.gcc.specs \
 		$(WINGCC_INST_DIR)/lib/gcc/$(XGCC_TARGET64)/$(VERSION_GCC)/specs
-- 
cgit v0.12