diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2013-12-08 18:35:06 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-12-08 18:35:21 +0400 |
| commit | 901ebbd94acb747a774fa287d94139b703e326e9 (patch) | |
| tree | 9a227c91281a7216e0ef0a195a9aef6ffdbf385d /build_files/scons/tools/btools.py | |
| parent | 38adc8a91fcf1952f2d6c78a86d7441ebd6899a4 (diff) | |
Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID,
leave env set for OSX exclusive for now”
Diffstat (limited to 'build_files/scons/tools/btools.py')
| -rw-r--r-- | build_files/scons/tools/btools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index fd312183df5..715d9220682 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -179,7 +179,7 @@ def validate_arguments(args, bc): 'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS', 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS', 'C_WARN', 'CC_WARN', 'CXX_WARN', - 'LLIBS', 'PLATFORM_LINKFLAGS', 'MACOSX_ARCHITECTURE', 'MACOSX_SDK', 'XCODE_CUR_VER', 'MACOSX_COMPILER', + 'LLIBS', 'PLATFORM_LINKFLAGS', 'MACOSX_ARCHITECTURE', 'MACOSX_SDK', 'XCODE_CUR_VER', 'C_COMPILER_ID', 'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET' ] @@ -504,7 +504,7 @@ def read_opts(env, cfg, args): ('MACOSX_SDK', 'Set OS X SDK', ''), ('XCODE_CUR_VER', 'Detect XCode version', ''), ('MACOSX_DEPLOYMENT_TARGET', 'Detect OS X target version', ''), - ('MACOSX_COMPILER', 'Detect the resolved compiler', ''), + ('C_COMPILER_ID', 'Detect the resolved compiler', ''), (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)), ('BF_PROFILE_CFLAGS', 'C only profiling flags', []), |