Merge branch 'feature/10081_clang_compilation_mac' into develop

mantidproject · Aug 15, 2014 · 50208cd · 50208cd
2 parents 0a14f84 + 1773308
commit 50208cd
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/Code/Mantid/Build/Jenkins/buildscript b/Code/Mantid/Build/Jenkins/buildscript
@@ -18,15 +18,24 @@ cmake --version
 # OS X setup steps
 ###############################################################################
 if [[ $(uname) == 'Darwin' ]]; then
-  cd $WORKSPACE/Code
-  ./fetch_Third_Party.sh
-  cd $WORKSPACE
-  # Setup environment variables
-  source /opt/intel/bin/iccvars.sh intel64
-  export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$WORKSPACE/Code/Third_Party/lib/mac64:/Library/Frameworks
-  # Make sure we pick up the Intel compiler
-  export CC=icc
-  export CXX=icpc
+  if [[ ${JOB_NAME} == *clang* ]]; then
+    # Assuming we are using the clang compiler
+    echo "Using clang/llvm compiler."
+    clang --version
+  else
+    # Assuming we are using the Intel compiler
+    cd $WORKSPACE/Code
+    ./fetch_Third_Party.sh
+    cd $WORKSPACE
+    # Setup environment variables
+    source /opt/intel/bin/iccvars.sh intel64
+    export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$WORKSPACE/Code/Third_Party/lib/mac64:/Library/Frameworks
+    # Make sure we pick up the Intel compiler
+    export CC=icc
+    export CXX=icpc
+    echo "Using Intel compiler."
+    icpc --version
+  fi
 fi
 
 ###############################################################################