Commit e8e56b40 authored by cyrush's avatar cyrush

build_visit 10.9 fixes: use clang, use qt 4.8.6

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23682 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6775c9f7
......@@ -55,6 +55,10 @@ if [[ "$OPSYS" == "Darwin" ]]; then
# Kernel versions to OSX version numbers.
# Other options for dealing with MACOSX_DEPLOYMENT_TARGET didn't work
# See issue #1499 (https://visitbugs.ornl.gov/issues/1499)
# use gcc for 10.9 & earlier
if (( ${VER%%.*} < 8 )) ; then
export MACOSX_DEPLOYMENT_TARGET=10.3
elif [[ ${VER%%.*} == 8 ]] ; then
......@@ -69,11 +73,18 @@ if [[ "$OPSYS" == "Darwin" ]]; then
export MACOSX_DEPLOYMENT_TARGET=10.8
elif [[ ${VER%%.*} == 13 ]] ; then
export MACOSX_DEPLOYMENT_TARGET=10.9
export C_COMPILER=${C_COMPILER:-"clang"}
export CXX_COMPILER=${CXX_COMPILER:-"clang++"}
else
export MACOSX_DEPLOYMENT_TARGET=10.9
export C_COMPILER=${C_COMPILER:-"clang"}
export CXX_COMPILER=${CXX_COMPILER:-"clang++"}
fi
export C_COMPILER=${C_COMPILER:-"gcc"}
export CXX_COMPILER=${CXX_COMPILER:-"g++"}
# Disable Fortran on Darwin since it causes HDF5, H5Part, Silo, ADIOS builds to explode.
export FC_COMPILER=""
export C_OPT_FLAGS=${C_OPT_FLAGS:-"-O2"}
......
......@@ -126,11 +126,20 @@ function bv_qt_depends_on
function bv_qt_info
{
# if we are on osx 10.9, we need to use 4.8.6
if [[ "$OPSYS" == "Darwin" ]]; then
if [[ "${MACOSX_DEPLOYMENT_TARGET}" == "10.9" ]]; then
export QT_FILE=${QT_FILE:-"qt-everywhere-opensource-src-4.8.6.tar.gz"}
export QT_VERSION=${QT_VERSION:-"4.8.6"}
export QT_MD5_CHECKSUM="2edbe4d6c2eff33ef91732602f3518eb"
fi
fi
export QT_FILE=${QT_FILE:-"qt-everywhere-opensource-src-4.8.3.tar.gz"}
export QT_VERSION=${QT_VERSION:-"4.8.3"}
export QT_FILE=${QT_FILE:-"qt-everywhere-opensource-src-${QT_VERSION}.tar.gz"}
export QT_MD5_CHECKSUM=${QT_MD5_CHECKSUM:-"a663b6c875f8d7caa8ac9c30e4a4ec3b"}
export QT_BUILD_DIR=${QT_BUILD_DIR:-"${QT_FILE%.tar*}"}
export QT_BIN_DIR="${QT_BUILD_DIR}/bin"
export QT_MD5_CHECKSUM="a663b6c875f8d7caa8ac9c30e4a4ec3b"
export QT_SHA256_CHECKSUM=""
}
......
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