From 11d420e1f0cf07a62076bd00504545dd6a12ddea Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Sat, 26 Nov 2016 21:57:47 +0100
Subject: [PATCH] continuous-build.sh: set CC=x86_64-jehanne-gcc

---
 continuous-build.sh            | 2 +-
 src/jehanne/cmd/build/build.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/continuous-build.sh b/continuous-build.sh
index 9675817..b5eb7b7 100755
--- a/continuous-build.sh
+++ b/continuous-build.sh
@@ -25,7 +25,7 @@ if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then
 	fi
 
 	export TOOLPREFIX=x86_64-jehanne-
-	export CC=gcc
+	export CC=x86_64-jehanne-gcc
 
 	echo
 	echo "Vendorized code verification..."
diff --git a/src/jehanne/cmd/build/build.go b/src/jehanne/cmd/build/build.go
index 132f3d5..3966d1b 100644
--- a/src/jehanne/cmd/build/build.go
+++ b/src/jehanne/cmd/build/build.go
@@ -639,7 +639,7 @@ func findTools(toolprefix string) {
 		if x := os.Getenv(strings.ToUpper(k)); x != "" {
 			v = x
 		}
-		if v != "sh" {
+		if toolprefix != "" && v != "sh" && !strings.Contains(v, toolprefix) {
 			v = toolprefix + v;
 		}
 		v, err = exec.LookPath(v)