Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: gyp/icu.gyp

Issue 1664923002: Revert "Factor out xcode c/cpp settings into variables to apply to cmake builds." (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/icu.gyp
diff --git a/gyp/icu.gyp b/gyp/icu.gyp
index 27bd60fa1690e4f138f80a9682fe1f95ed14f347..5142b77ed678f57395235b6e529c999e09174a1f 100644
--- a/gyp/icu.gyp
+++ b/gyp/icu.gyp
@@ -120,7 +120,7 @@
'skia_os == "mac"', {
'sources': [ '<(icu_directory)/mac/icudtl_dat.S', ],
'xcode_settings': {
- 'OTHER_CPLUSPLUSFLAGS': [ '-frtti' ],
+ 'GCC_ENABLE_CPP_RTTI': 'YES', # -frtti
'WARNING_CFLAGS': [ '-w' ],
},
}
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698