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..1622ef1bc03efbf056a218204721c06e250f1e74 100755 |
| --- a/tools/gyp/find_mac_gcc_version.py |
| +++ b/tools/gyp/find_mac_gcc_version.py |
| @@ -21,10 +21,13 @@ 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' |
| + elif major == 4 and minor == 5: |
|
ricow1
2013/04/24 14:01:47
minor >= 5?
if xcode is selecting it automatically
kustermann
2013/04/24 14:10:06
I discussed this with ivan offline: we can't be su
kustermann
2013/04/24 14:42:59
Ivan pointed out we can install XCode 4.6. I tried
hausner
2013/04/24 20:33:20
I have XCode 4.6.1 (4H512) on my new laptop that I
kustermann
2013/04/24 20:59:10
This should not happen. I tried it on my macbook (
|
| + # XCode seems to select the specific clang version automatically |
| + return 'com.apple.compilers.llvm.clang.1_0' |
| else: |
| raise Exception('Unknown XCode Version "%s"' % version_match) |
| else: |