diff options
Diffstat (limited to 'www/chromium/files/patch-issue-17359002')
| -rw-r--r-- | www/chromium/files/patch-issue-17359002 | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/www/chromium/files/patch-issue-17359002 b/www/chromium/files/patch-issue-17359002 new file mode 100644 index 000000000000..36cad6a934e5 --- /dev/null +++ b/www/chromium/files/patch-issue-17359002 @@ -0,0 +1,35 @@ +Index: tools/gyp/pylib/gyp/generator/ninja.py +=================================================================== +--- tools/gyp/pylib/gyp/generator/ninja.py (revision 1690) ++++ tools/gyp/pylib/gyp/generator/ninja.py (working copy) +@@ -755,9 +755,16 @@ + self.WriteVariableList(ninja_file, '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('CPPFLAGS', '').split() + ++ os.environ.get('CFLAGS', '').split() + ++ config.get('cflags_c', [])) ++ cflags_cc = (os.environ.get('CPPFLAGS', '').split() + ++ os.environ.get('CXXFLAGS', '').split() + ++ config.get('cflags_cc', [])) ++ + defines = config.get('defines', []) + extra_defines + self.WriteVariableList(ninja_file, 'defines', + [Define(d, self.flavor) for d in defines]) +@@ -932,7 +939,10 @@ + if def_file: + implicit_deps.add(def_file) + 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': |