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

Unified Diff: pylib/gyp/xcode_emulation.py

Issue 10383090: mac make & ninja: Remove workaround for OTHER_CPLUSPLUSFLAGS being a string. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/xcode_emulation.py
===================================================================
--- pylib/gyp/xcode_emulation.py (revision 1373)
+++ pylib/gyp/xcode_emulation.py (working copy)
@@ -364,14 +364,7 @@
other_ccflags = []
- # TODO(thakis): Remove this once
- # http://code.google.com/p/webrtc/source/detail?r=2028 is rolled into
- # chromium.
- flags = self._Settings().get('OTHER_CPLUSPLUSFLAGS', ['$(inherited)'])
- if not isinstance(flags, list):
- flags = [flags]
-
- for flag in flags:
+ for flag in self._Settings().get('OTHER_CPLUSPLUSFLAGS', ['$(inherited)']):
# TODO: More general variable expansion. Missing in many other places too.
if flag in ('$inherited', '$(inherited)', '${inherited}'):
flag = '$OTHER_CFLAGS'
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698