diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 17:56:11 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 17:56:11 +0400 |
| commit | 96aaea414baf6e84bab527fb35c303f2a913cc7e (patch) | |
| tree | e56c235af48d57f2c6c06c9502d6d9752a64a853 /build_files/scons/config | |
| parent | 5f084aced0a92c25e1326967b4a33030858825fb (diff) | |
OSX/scons: more cleanup of redundant vars, preparation to remove local vars to not need to cp whole config as user-config later
Diffstat (limited to 'build_files/scons/config')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 75e37a59723..cbe9d7db1d7 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -40,29 +40,22 @@ else: if 'Mac OS X 10.5' in MACOSX_SDK_CHECK: # OSX 10.5/6 with Xcode 3.x - MAC_MIN_VERS = '10.5' MACOSX_DEPLOYMENT_TARGET = '10.5' MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk' - LCGDIR = '#../lib/darwin-9.x.universal' - CC = 'gcc-4.2' - CXX = 'g++-4.2' elif 'Mac OS X 10.6' in MACOSX_SDK_CHECK: # OSX 10.6/7 with Xcode 4.x - MAC_MIN_VERS = '10.6' MACOSX_DEPLOYMENT_TARGET = '10.6' MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk' - LCGDIR = '#../lib/darwin-9.x.universal' - CC = 'gcc-4.2' - CXX = 'g++-4.2' else: - # OSX 10.8 with Xcode 4.4 and higher (no 10.6sdk! ) - MAC_MIN_VERS = '10.6' + # OSX 10.7/8/9 with Xcode 4.4 and higher (no 10.6sdk! ) MACOSX_DEPLOYMENT_TARGET = '10.6' MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk' - LCGDIR = '#../lib/darwin-9.x.universal' - CC = 'gcc' - CXX = 'g++' +MAC_MIN_VERS = MACOSX_DEPLOYMENT_TARGET +# gcc always defaults to the system standard compiler linked by a shim or symlink +CC = 'gcc' +CXX = 'g++' +LCGDIR = '#../lib/darwin-9.x.universal' LIBDIR = '${LCGDIR}' if XCODE_CUR_VER >= '4.3': ## since version 4.3, XCode and developer dir are bundled ## |