Merge pull request #590 from MethodicalAcceleratorDesign/ld-dev

add set env for intel if it exists
MethodicalAcceleratorDesign · Feb 28, 2018 · c1a303d · c1a303d
2 parents 206382b + 032e813
commit c1a303d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/scripts/build-test-linux.sh b/scripts/build-test-linux.sh
@@ -96,6 +96,10 @@ check_error "make all-linux64-gnu failed" "no-exit"
 
 echo -e "\n===== Intel build ====="
 
+if [ "`which compilervars.sh`" != "" ] ; then
+  source compilervars.sh intel64
+fi
+
 if [ "`which icc`" != "" -a "`which ifort`" != "" ] ; then
   source compilervars.sh ia32
   icc      -V

diff --git a/scripts/build-test-lxplus.sh b/scripts/build-test-lxplus.sh
@@ -106,6 +106,10 @@ check_error "make all-linux64-gnu failed" "no-exit"
 
 echo -e "\n===== Intel build ====="
 
+if [ -f "/cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh" ] ; then
+  source /cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh intel64
+fi
+
 if [ "`which icc`" != "" -a "`which ifort`" != "" ] ; then
   source /cvmfs/projects.cern.ch/intelsw/psxe/linux/all-setup.sh ia32
   icc      --version