diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 18:03:51 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-06 18:03:51 +0400 |
| commit | 3e6c3698882475698a879d8eff99f094874017b6 (patch) | |
| tree | 899d191ab33a73ee924d469ab8931ebb25065b38 /build_files | |
| parent | 96aaea414baf6e84bab527fb35c303f2a913cc7e (diff) | |
OSX/scons: remove local MAC_MIN_VERS var and use the always identical MACOSX_DEPLOYMENT_TARGET instead
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index cbe9d7db1d7..572bb7026cc 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -51,7 +51,6 @@ else: MACOSX_DEPLOYMENT_TARGET = '10.6' MACOSX_SDK='/Developer/SDKs/MacOSX10.8.sdk' -MAC_MIN_VERS = MACOSX_DEPLOYMENT_TARGET # gcc always defaults to the system standard compiler linked by a shim or symlink CC = 'gcc' CXX = 'g++' @@ -329,8 +328,8 @@ else: LLIBS = ['stdc++', 'SystemStubs'] if USE_SDK: - SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE] - PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS + SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MACOSX_DEPLOYMENT_TARGET,'-arch',MACOSX_ARCHITECTURE] + PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MACOSX_DEPLOYMENT_TARGET,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS CCFLAGS=SDK_FLAGS+CCFLAGS CXXFLAGS=SDK_FLAGS+CXXFLAGS |