Chromium Code Reviews| Index: tools/gyp/find_mac_gcc_version.py |
| diff --git a/tools/gyp/find_mac_gcc_version.py b/tools/gyp/find_mac_gcc_version.py |
| index 0af84120b6b22e9d1fa09b094252090c345124b9..573e27e526e59ae4b4efd54c9415a0b7958fc094 100755 |
| --- a/tools/gyp/find_mac_gcc_version.py |
| +++ b/tools/gyp/find_mac_gcc_version.py |
| @@ -21,12 +21,14 @@ def main(): |
| major = int(matches[0][0]) |
| minor = int(matches[0][1]) |
| - if major >= 4: |
| - return 'com.apple.compilers.llvmgcc42' |
| - elif major == 3 and minor >= 1: |
| + if major == 3 and minor >= 1: |
| return '4.2' |
| + elif major == 4 and minor < 5: |
| + return 'com.apple.compilers.llvmgcc42' |
| else: |
| - raise Exception('Unknown XCode Version "%s"' % version_match) |
| + # XCode seems to select the specific clang version automatically |
| + return 'com.apple.compilers.llvm.clang.1_0' |
| + raise Exception('Unknown XCode Version "%s"' % version_match) |
|
ricow1
2013/04/24 13:48:09
you can't hit this raise
Ivan Posva
2013/04/24 13:48:33
Under what condition will you raise this exception
kustermann
2013/04/24 13:58:54
True.
|
| else: |
| raise Exception('Could not parse output of xcodebuild "%s"' % stdout) |