BUG: inconsistent gcc libraries between makeGcc and OpenFOAM

- explicitly define WM_COMPILER_TYPE=ThirdParty before sourcing
  the OpenFOAM settings. Provide system equivalents as fallbacks
  so that it is apparent what is happening.
  Make the same adjustment to makeLLVM.

BUG: inconsistent CGAL version between makeCGAL and OpenFOAM
This commit is contained in:
mark
2016-06-16 13:09:45 +02:00
parent b06f4a8639
commit a66c85ce80
3 changed files with 70 additions and 33 deletions

View File

@ -37,12 +37,14 @@
# cd -
#
#------------------------------------------------------------------------------
# get default llvm/clang version
WM_COMPILER_TYPE="ThirdParty" # ensure we get the correct compiler settings
WM_COMPILER=Clang # force values for 'clang'
# get default llvm version
. $WM_PROJECT_DIR/etc/config.sh/functions
_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
llvmPACKAGE=${clang_version:-llvm-3.7.0}
llvmPACKAGE=$clang_version
#------------------------------------------------------------------------------
# run from third-party directory only
@ -54,13 +56,16 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
}
. etc/tools/ThirdPartyFunctions
#------------------------------------------------------------------------------
Script=${0##*/}
usage() {
exec 1>&2
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
cat<<USAGE
usage: ${0##*/} [llvm-VERSION]
usage: $Script [OPTION] [llvm-VERSION]
options:
-help
* build llvm/clang
$llvmPACKAGE
@ -69,6 +74,8 @@ USAGE
exit 1
}
#-----------------------------------------------------------------------------
# parse options
while [ "$#" -gt 0 ]
@ -87,6 +94,12 @@ do
esac
done
if [ -z "$llvmPACKAGE" ]
then
die "The llvm-VERSION was not specified"
exit 1
fi
#------------------------------------------------------------------------------
# build/install without compiler name
buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER_ARCH