Mac OS X: removing the revision number from 10.7
This commit is contained in:
parent
84b4a7e696
commit
779fcf8a8f
2 changed files with 8 additions and 4 deletions
|
@ -245,7 +245,9 @@ Darwin)
|
|||
esac
|
||||
|
||||
# Make sure that binaries use the best features of the used OS-Version
|
||||
export MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion`
|
||||
# We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
|
||||
v=( ${MACOSX_DEPLOYMENT_TARGET//./ } )
|
||||
export MACOSX_DEPLOYMENT_TARGET="${v[0]}.${v[1]}"
|
||||
|
||||
if [ "$compilerInstall" == "System" ]
|
||||
then
|
||||
|
@ -301,7 +303,7 @@ cleanEnv=`$cleanProg "$PATH" "$foamOldDirs"` && PATH="$cleanEnv"
|
|||
cleanEnv=`$cleanProg "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleanEnv"
|
||||
|
||||
#- Clean DYLD_LIBRARY_PATH
|
||||
if [[ "$WM_ARCH_BASE" == "darwin" ]]
|
||||
if [[ "$WM_ARCH_BASE" == "darwin" ]]
|
||||
then
|
||||
cleanEnv=`$cleanProg "$DYLD_LIBRARY_PATH" "$foamOldDirs"` && DYLD_LIBRARY_PATH="$cleanEnv"
|
||||
fi
|
||||
|
|
|
@ -242,11 +242,13 @@ case Darwin:
|
|||
endsw
|
||||
|
||||
# Make sure that binaries use the best features of the used OS-Version
|
||||
setenv MACOSX_DEPLOYMENT_TARGET `sw_vers -productVersion`
|
||||
# We need to get rid of the revision number from this string. eg turn "10.7.5" into "10.7"
|
||||
set v=`sw_vers -productVersion | sed 's/\./ /g'`
|
||||
setenv MACOSX_DEPLOYMENT_TARGET "$v[1].$v[2]"
|
||||
|
||||
# Use Mac-Ports-Compiler instead of Apple-gcc-4.2
|
||||
if ( ! $?compilerInstall ) setenv compilerInstall System
|
||||
if ( $compilerInstall == "System" ) then
|
||||
if ( $compilerInstall == "System" ) then
|
||||
switch ($WM_COMPILER)
|
||||
case Gcc43:
|
||||
setenv WM_CC 'gcc-mp-4.3'
|
||||
|
|
Reference in a new issue