From 6d55aa7070c59438e36e4ce13ffc0bd2b102cec7 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Fri, 8 Jun 2018 12:10:58 -0400
Subject: [PATCH] [jenkins] Support brew installed in other places

---
 Jenkinsfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9be25fcc..4befd5c0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
 
 def osxPlatforms = [
   ["gcc", ['CC=gcc-7', 'CXX=g++-7']],
-  ["clang", ['CC=/usr/local/opt/llvm/bin/clang', 'CXX=/usr/local/opt/llvm/bin/clang++', 'CXXFLAGS=-I/usr/local/opt/llvm/include', 'LDFLAGS=-L/usr/local/opt/llvm/lib']]
+  ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
 ]
 for (int i = 0; i < osxPlatforms.size(); i++) {
   def platformEnv = osxPlatforms[i]
@@ -59,10 +59,10 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
       }
 
       checkout scm
-      dir(buildDir) { withEnv(platformEnv[1]+[
-          "PATH=$triqsDir/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin",
-          "CPATH=$triqsDir/include",
-          "LIBRARY_PATH=$triqsDir/lib",
+      dir(buildDir) { withEnv(platformEnv[1].collect { it.replace('\$BREW', env.BREW) } + [
+        "PATH=$triqsDir/bin:${env.BREW}/bin:/usr/bin:/bin:/usr/sbin",
+        "CPATH=$triqsDir/include:${env.BREW}/include",
+        "LIBRARY_PATH=$triqsDir/lib:${env.BREW}/lib",
           "CMAKE_PREFIX_PATH=$triqsDir/share/cmake"]) {
         deleteDir()
         sh "cmake $srcDir -DCMAKE_INSTALL_PREFIX=$installDir -DTRIQS_ROOT=$triqsDir"