Commit f1994cef authored by sdefresne's avatar sdefresne Committed by Commit bot

Fix compilation with Xcode 6.0.1

Apply Xcode 6.0 fix to all following versions of Xcode (it's great that
gyp does support python string ordering).

BUG=385030

Review URL: https://codereview.chromium.org/589493002

Cr-Commit-Position: refs/heads/master@{#295699}
parent dd449e72
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')', 'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
}, },
'conditions': [ 'conditions': [
['xcode_version=="6.0"', { ['xcode_version>="6.0"', {
'variables': { 'variables': {
'iphone_sim_path': '<(developer_dir)/../SharedFrameworks', 'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
}, },
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
'message': 'Generating CoreSimulator.h', 'message': 'Generating CoreSimulator.h',
}, },
], # actions ], # actions
}, { # else: xcode_version!="6" }, { # else: xcode_version<"6.0"
'variables': { 'variables': {
'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks', 'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks',
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment