Fixing external cmake script

sithhell · Nov 3, 2015 · 57aaf5c · 57aaf5c
1 parent 4927c8e
commit 57aaf5c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/babbage/install.sh b/babbage/install.sh
@@ -16,8 +16,8 @@ MODULEPATH_BAK=$MODULEPATH
 MODULEPATH=/project/projectdirs/xpress/tau2-hpx/modulefiles:$MODULEPATH
 
 load_modules "${MODULES_MIC}"
-CC=icc
-CXX=icpc
+CC=`which icc`
+CXX=`which icpc`
 CFLAGS="-mmic"
 CXXFLAGS="-std=c++14 -mmic -DBOOST_NO_CXX11_ALLOCATOR"
 LDFLAGS="-mmic"
@@ -54,8 +54,8 @@ echo ""
 echo "Building dependencies for the Host"
 
 load_modules "${MODULES_HOST}"
-CC=icc
-CXX=icpc
+CC=`which icc`
+CXX=`which icpc`
 CFLAGS=
 CXXFLAGS="-std=c++14"
 LDFLAGS=""

diff --git a/edison/install.sh b/edison/install.sh
@@ -25,8 +25,8 @@ make_hwloc "edison/hwloc"
 make_jemalloc "edison/jemalloc"
 make_lua "edison/lua"
 make_ah "edison/activeharmony"
-CC=
-CXX=
+CC=`which cc`
+CXX=`which CC`
 CFLAGS=
 CXXFLAGS="-std=c++14"
 LDFLAGS=""

diff --git a/misc/hpx.sh b/misc/hpx.sh
@@ -90,7 +90,7 @@ function hpx_cmake()
 
     cat << EOF >> $BASE_PATH/packages/$PREFIX/hpx/$BUILD_TYPE/bin/hpxcmake
 #!/bin/bash
-cmake -DCMAKE_CXX_COMPILER=${CC} \
+cmake -DCMAKE_CXX_COMPILER=${CXX} \
     -DCMAKE_C_COMPILER=${CC} \
     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     "\$@"