summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2014-09-19 07:06:57 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-19 14:07:09 +0000
commitf1994cefc7b38467ad408e79b1b8a1e3e4d50b5a (patch)
tree4430a262476ab92940067d45da9de761a164ab83 /testing
parentdd449e72e25d814f1915ff0dea337d9f733aabef (diff)
downloadchromium_src-f1994cefc7b38467ad408e79b1b8a1e3e4d50b5a.zip
chromium_src-f1994cefc7b38467ad408e79b1b8a1e3e4d50b5a.tar.gz
chromium_src-f1994cefc7b38467ad408e79b1b8a1e3e4d50b5a.tar.bz2
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}
Diffstat (limited to 'testing')
-rw-r--r--testing/iossim/iossim.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/iossim/iossim.gyp b/testing/iossim/iossim.gyp
index 81334a1..a8ad603 100644
--- a/testing/iossim/iossim.gyp
+++ b/testing/iossim/iossim.gyp
@@ -18,7 +18,7 @@
'xcode_version': '<!(xcodebuild -version | grep Xcode | awk \'{print $2}\')',
},
'conditions': [
- ['xcode_version=="6.0"', {
+ ['xcode_version>="6.0"', {
'variables': {
'iphone_sim_path': '<(developer_dir)/../SharedFrameworks',
},
@@ -76,7 +76,7 @@
'message': 'Generating CoreSimulator.h',
},
], # actions
- }, { # else: xcode_version!="6"
+ }, { # else: xcode_version<"6.0"
'variables': {
'iphone_sim_path': '<(developer_dir)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks',
},