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

Unified Diff: build/common.gypi

Issue 42650: Update Linux gyp build to import and propagate external environment... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 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 | « build/SConscript.main ('k') | site_scons/site_tools/chromium_builders.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 12565)
+++ build/common.gypi (working copy)
@@ -131,8 +131,8 @@
'-m32',
'-pthread',
],
- 'scons_settings': {
- 'LIBPATH': ['$DESTINATION_ROOT/lib'],
+ 'scons_variable_settings': {
+ 'LIBPATH': ['$LIB_DIR'],
# Linking of large files uses lots of RAM, so serialize links
# using the handy flock command from util-linux.
'FLOCK_LINK': ['flock', '$DESTINATION_ROOT/linker.lock', '$LINK'],
@@ -155,6 +155,20 @@
'SHLINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$SHLINFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']],
'IMPLICIT_COMMAND_DEPENDENCIES': 0,
},
+ 'scons_import_variables': [
+ 'CC',
+ 'CXX',
+ 'LINK',
+ ],
+ 'scons_propagate_variables': [
+ 'CC',
+ 'CCACHE_DIR',
+ 'CXX',
+ 'DISTCC_DIR',
+ 'DISTCC_HOSTS',
+ 'HOME',
+ 'LINK',
+ ],
},
}],
['OS=="mac"', {
« no previous file with comments | « build/SConscript.main ('k') | site_scons/site_tools/chromium_builders.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698