Commit f93711d5 authored by brugger's avatar brugger
Browse files

I modified the cab config site file back to using gcc 4.8.2 and the test
suite script to account for that since it didn't fix any of the test 
suite crashes.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31507 18c085ea-50e0-402c-830e-de6fd14e8384
parent c38cdf6a
#/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.9/bin/cmake
#/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake
##
## ./build_visit2_13_0 generated host.cmake
## created: Wed Sep 6 08:06:07 PDT 2017
......@@ -8,8 +8,8 @@
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/chaos5)
SET(VISITARCH linux-x86_64_gcc-4.9)
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0)
SET(VISITARCH linux-x86_64_gcc-4.8)
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)
## Compiler flags.
......
......@@ -267,12 +267,12 @@ if test "$serial" = "true" ; then
sed -i "s/VISIT_PARALLEL ON/VISIT_PARALLEL OFF/" config-site/surface86-test.cmake
fi
if test "$branch" = "trunk" ; then
export PATH=/opt/rh/devtoolset-3/root/usr/bin:\$PATH
export GNU_INCLUDES=/opt/rh/devtoolset-3/root/usr/include/c++/4.9.2
export GNU_LIBS=/opt/rh/devtoolset-3/root/usr/lib64:/opt/rh/devtoolset-3/root/usr/lib/gcc/x86_64-redhat-linux/4.9.2
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rh/devtoolset-3/root/usr/lib64:/opt/rh/devtoolset-3/root/usr/lib/gcc/x86_64-redhat-linux/4.9.2
export _LMFILES_=/opt/modules/modulefiles/gnu/4.9.2
/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/chaos5/cmake/3.8.1/linux-x86_64_gcc-4.9/bin/cmake \
export PATH=/opt/rh/devtoolset-2/root/usr/bin:\$PATH
export GNU_INCLUDES=/opt/rh/devtoolset-2/root/usr/include/c++/4.8.2
export GNU_LIBS=/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/rh/devtoolset-2/root/usr/lib64:/opt/rh/devtoolset-2/root/usr/lib/gcc/x86_64-redhat-linux/4.8.2
export _LMFILES_=/opt/modules/modulefiles/gnu/4.8.2
/usr/workspace/wsa/visit/visit/thirdparty_shared/2.13.0/cmake/3.8.1/linux-x86_64_gcc-4.8/bin/cmake \
-DVISIT_CONFIG_SITE=config-site/cab667.cmake \
-DCMAKE_BUILD_TYPE=Release \
-DVISIT_BUILD_ALL_PLUGINS=1 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment