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

Unified Diff: pylib/gyp/generator/ninja.py

Issue 17359002: Linux: make ninja respect environment: (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 6 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/generator/ninja.py
===================================================================
--- pylib/gyp/generator/ninja.py (revision 1651)
+++ pylib/gyp/generator/ninja.py (working copy)
@@ -753,9 +753,14 @@
self.WriteVariableList('pchprefix', [self.name])
else:
cflags = config.get('cflags', [])
- cflags_c = config.get('cflags_c', [])
- cflags_cc = config.get('cflags_cc', [])
+ # Respect environment variables related to build, but target-specific
+ # flags can still override them.
+ cflags_c = (os.environ.get('CFLAGS', '').split() +
+ config.get('cflags_c', []))
+ cflags_cc = (os.environ.get('CXXFLAGS', '').split() +
+ config.get('cflags_cc', []))
Nico 2013/06/25 00:42:35 Does it make sense to also check CPPFLAGS and add
Paweł Hajdan Jr. 2013/07/24 23:16:55 Done.
+
defines = config.get('defines', []) + extra_defines
self.WriteVariableList('defines', [Define(d, self.flavor) for d in defines])
if self.flavor == 'win':
@@ -925,7 +930,10 @@
self.GypPathToNinja, self.ExpandSpecial, manifest_name, is_executable)
self.WriteVariableList('manifests', manifest_files)
else:
- ldflags = config.get('ldflags', [])
+ # Respect environment variables related to build, but target-specific
+ # flags can still override them.
+ ldflags = (os.environ.get('LDFLAGS', '').split() +
+ config.get('ldflags', []))
if is_executable and len(solibs):
rpath = 'lib/'
if self.toolset != 'target':
« 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