From a4f3f9482758e3191f706e568a05b5491b3df93a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ji=C5=99=C3=AD=20Z=C3=A1rev=C3=BAcky?=
 <zarevucky.jiri@gmail.com>
Date: Tue, 27 Mar 2018 20:24:51 +0200
Subject: [PATCH] Attempt to fix cross-compilers.

---
 gcc/HARBOUR | 14 +++++++++++++-
 hsct.sh     |  3 ++-
 pcc/HARBOUR |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/gcc/HARBOUR b/gcc/HARBOUR
index e7d87f0..1c4bff6 100644
--- a/gcc/HARBOUR
+++ b/gcc/HARBOUR
@@ -82,9 +82,21 @@ build() {
 	cd build
 	
 	# This is extremely crippled version but it at least compiles
+
+	CC_FOR_TARGET="$HSCT_TARGET-cc" \
+	CXX_FOR_TARGET="$HSCT_TARGET-cxx" \
+	GCC_FOR_TARGET="$HSCT_TARGET-cc" \
+	AR_FOR_TARGET="$HSCT_TARGET-ar" \
+	AS_FOR_TARGET="$HSCT_TARGET-as" \
+	LD_FOR_TARGET="$HSCT_TARGET-ld" \
+	NM_FOR_TARGET="$HSCT_TARGET-nm" \
+	OBJDUMP_FOR_TARGET="$HSCT_TARGET-objdump" \
+	RANLIB_FOR_TARGET="$HSCT_TARGET-ranlib" \
+	STRIP_FOR_TARGET="$HSCT_TARGET-strip" \
+	\
 	run ../${shipname}-${shipversion}/configure \
 		$HSCT_CONFIGURE_ARGS \
-		--target=$HSCT_CCROSS_TARGET \
+		--target="$HSCT_CCROSS_TARGET" \
 		--program-prefix="" \
 		--disable-werror \
 		--without-ppl \
diff --git a/hsct.sh b/hsct.sh
index d9c9d31..d8da49f 100755
--- a/hsct.sh
+++ b/hsct.sh
@@ -453,6 +453,7 @@ hsct_print_vars() {
 	echo "export HSCT_LDLIBS='$HELENOS_LDLIBS'"
 
 	target="$HELENOS_ARCH-helenos"
+	cctarget="$HELENOS_ARCH-linux-gnu"
 	cvars="CC=$target-cc CXX=$target-cxx AR=$target-ar AS=$target-as CPP=$target-cpp NM=$target-nm OBJDUMP=$target-objdump OBJCOPY=$target-objcopy STRIP=$target-strip RANLIB=$target-ranlib"
 	
 	echo "export HSCT_CC='$target-cc'"
@@ -460,7 +461,7 @@ hsct_print_vars() {
 	echo "export HSCT_TARGET='$target'"
 	echo "export HSCT_REAL_TARGET='$HELENOS_TARGET'"
 	# Target to set for cross-compiled cross-compilers.
-	echo "export HSCT_CCROSS_TARGET='$HELENOS_ARCH-linux-gnu'"
+	echo "export HSCT_CCROSS_TARGET='$cctarget'"
 	echo "export HSCT_CONFIGURE_VARS='$cvars'"
 	echo "export HSCT_CONFIGURE_ARGS='--build=`sh $HSCT_HOME/config.guess` --host=$target $cvars'"
 
diff --git a/pcc/HARBOUR b/pcc/HARBOUR
index 3549b69..9759135 100644
--- a/pcc/HARBOUR
+++ b/pcc/HARBOUR
@@ -54,7 +54,7 @@ build() {
 
 	run ./configure \
 		$HSCT_CONFIGURE_ARGS \
-		--target=$HELENOS_ARCH-linux-gnu \
+		--target="$HSCT_CCROSS_TARGET" \
 		--program-prefix="" \
 		--bindir=/app \
 		--libexecdir=/app \
@@ -81,6 +81,6 @@ package() {
 
 	mkdir -p "$HSCT_MY_DIR/app"
 	for app in pcc cpp ccom; do
-		run cp "PKG/app/$HELENOS_ARCH-linux-gnu-$app" "$HSCT_MY_DIR/app/$app" || return 1
+		run cp "PKG/app/$HSCT_CCROSS_TARGET-$app" "$HSCT_MY_DIR/app/$app" || return 1
 	done
 }
-- 
2.11.4.GIT