From fc63a34c55b62d12c9e4bf0364d26bad783e48f7 Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Sun, 23 Apr 2017 14:03:18 +0200
Subject: [PATCH] coverity-scan.sh: set CPATH to workaround cross-compiling
 issues

---
 coverity-scan.sh     | 5 +++++
 cross/pkgs/newlib.sh | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/coverity-scan.sh b/coverity-scan.sh
index 2b1b9c3..c9b6eb1 100755
--- a/coverity-scan.sh
+++ b/coverity-scan.sh
@@ -9,10 +9,15 @@ set -e
 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 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 de05caf..7b17e79 100755
--- a/cross/pkgs/newlib.sh
+++ b/cross/pkgs/newlib.sh
@@ -51,8 +51,6 @@ if [ "$NEWLIB_OPTIMIZATION" = "" ]; then
 fi
 
 export CC=gcc
-export CPATH=$CROSS_DIR/lib/gcc/x86_64-jehanne/4.9.4/include:$CROSS_DIR/lib/gcc/x86_64-jehanne/4.9.4/include-fixed
-
 
 # NOTE: we use -O0 because apparently vsprintf functions do not
 #       work with -O2.