From 4d5870031849243526ea47524edc713875b85b70 Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Sat, 22 Apr 2017 18:57:05 +0200
Subject: [PATCH] continuous-build.sh: set CPATH to workaround cross-compiling
 issues

---
 continuous-build.sh  | 8 +++++++-
 cross/pkgs/newlib.sh | 4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/continuous-build.sh b/continuous-build.sh
index 6781d95..bacf899 100755
--- a/continuous-build.sh
+++ b/continuous-build.sh
@@ -21,9 +21,15 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
 	cd `dirname $0`
 	cd ..
 	export JEHANNE=`pwd`
+	CROSS_TOOLCHAIN=$JEHANNE/hacking/cross/toolchain
 	export PATH="$JEHANNE/hacking/bin:$PATH"
-	export PATH="$JEHANNE/hacking/cross/toolchain/bin:$PATH"
+	export PATH="$CROSS_TOOLCHAIN/bin:$PATH"
 	export ARCH=amd64
+
+	# since our cross compiler is inside the system root, we need this too
+	# as it can't find it's own headers
+	export CPATH=$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/4.9.4/include:$CROSS_TOOLCHAIN/lib/gcc/x86_64-jehanne/4.9.4/include-fixed
+
 	git clean -xdf arch/ sys/ qa/ usr/
 	if [ ! -f "$JEHANNE/hacking/bin/ufs" ]; then
 		echo "Cannot find build tools in $JEHANNE/hacking/bin"
diff --git a/cross/pkgs/newlib.sh b/cross/pkgs/newlib.sh
index 9b1575b..83a089d 100755
--- a/cross/pkgs/newlib.sh
+++ b/cross/pkgs/newlib.sh
@@ -31,10 +31,6 @@ export NEWLIB_SRC=$NEWLIB/src/
 export NEWLIB_BUILD=$NEWLIB/build/
 export NEWLIB_PREFIX=$NEWLIB/output/
 
-# since our cross compiler is inside the system root, we need this too
-export CPATH=$CROSS_DIR/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include:$CROSS_DIR/toolchain/lib/gcc/x86_64-jehanne/4.9.4/include-fixed
-
-
 function failOnError {
 	# $1 -> exit status on a previous command
 	# $2 -> task description