diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-08 17:44:10 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-08 17:44:10 +0400 |
| commit | a3ec6edc05a4d4819d7e9ba448f74c3cc5f695bc (patch) | |
| tree | 1d5af09498a680e61c6b8f6d61d3601f68e78bbc /SConstruct | |
| parent | 8a717f83260e0402970ed770a342efaf1cf9a27e (diff) | |
OSX/scons: make MACOSX_SDK_CHECK a local var is sconstruct and remove from env, also fix a longstanding misuse of MACOSX_SDK_CHECK in ceres, use MACOSX_SDK instead
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 92f7d947662..4a08b691e07 100644 --- a/SConstruct +++ b/SConstruct @@ -293,7 +293,7 @@ if 'cudakernels' in B.targets: if env['OURPLATFORM']=='darwin': import commands - + cmd = 'sw_vers -productVersion' MAC_CUR_VER=cmd_res=commands.getoutput(cmd) cmd = 'xcodebuild -version' @@ -301,7 +301,7 @@ if env['OURPLATFORM']=='darwin': env['XCODE_CUR_VER']=cmd_xcode[6:][:3] # truncate output to major.minor version cmd = 'xcodebuild -showsdks' cmd_sdk=commands.getoutput(cmd) - env['MACOSX_SDK_CHECK']=cmd_sdk + MACOSX_SDK_CHECK=cmd_sdk cmd = 'xcode-select --print-path' XCODE_SELECT_PATH=commands.getoutput(cmd) if XCODE_SELECT_PATH.endswith("/Contents/Developer"): @@ -310,22 +310,22 @@ if env['OURPLATFORM']=='darwin': XCODE_BUNDLE=XCODE_SELECT_PATH print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --" - print "Available " + env['MACOSX_SDK_CHECK'] + print "Available " + MACOSX_SDK_CHECK if env['MACOSX_SDK'] == '': # no set sdk, choosing best one found - if 'OS X 10.9' in env['MACOSX_SDK_CHECK']: + if 'OS X 10.9' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk' - elif 'OS X 10.8' in env['MACOSX_SDK_CHECK']: + elif 'OS X 10.8' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.8.sdk' - elif 'OS X 10.7' in env['MACOSX_SDK_CHECK']: + elif 'OS X 10.7' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.7.sdk' - elif 'OS X 10.6' in env['MACOSX_SDK_CHECK']: + elif 'OS X 10.6' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.6' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.6.sdk' - elif 'OS X 10.5' in env['MACOSX_SDK_CHECK']: + elif 'OS X 10.5' in MACOSX_SDK_CHECK: env['MACOSX_DEPLOYMENT_TARGET'] = '10.5' env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.5.sdk' else: |