Title: [135528] trunk/Source/WebKit/chromium
- Revision
- 135528
- Author
- [email protected]
- Date
- 2012-11-22 09:30:59 -0800 (Thu, 22 Nov 2012)
Log Message
[chromium] Add OS!="ios" to guard for gcc_version in WebKit.gyp
https://bugs.webkit.org/show_bug.cgi?id=103007
Reviewed by Adam Barth.
This matches the guards used in chromium's chrome/chrome_browser.gypi.
* WebKit.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (135527 => 135528)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-22 17:03:02 UTC (rev 135527)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-22 17:30:59 UTC (rev 135528)
@@ -1,3 +1,14 @@
+2012-11-22 Dana Jansens <[email protected]>
+
+ [chromium] Add OS!="ios" to guard for gcc_version in WebKit.gyp
+ https://bugs.webkit.org/show_bug.cgi?id=103007
+
+ Reviewed by Adam Barth.
+
+ This matches the guards used in chromium's chrome/chrome_browser.gypi.
+
+ * WebKit.gyp:
+
2012-11-22 Stephen Chenney <[email protected]>
[Chromium]: Removing gyp flags controlling Skia features.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (135527 => 135528)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-11-22 17:03:02 UTC (rev 135527)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-11-22 17:30:59 UTC (rev 135528)
@@ -1078,7 +1078,7 @@
},
], # targets
'conditions': [
- ['os_posix==1 and OS!="mac" and gcc_version>=46', {
+ ['os_posix==1 and OS!="mac" and OS!="ios" and gcc_version>=46', {
'target_defaults': {
# Disable warnings about c++0x compatibility, as some names (such
# as nullptr) conflict with upcoming c++0x types.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
