summaryrefslogtreecommitdiffstats
path: root/build/gyp_chromium
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 00:45:30 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-24 00:45:30 +0000
commit1e673d00e6c7547e66d6399ed1b5e9cd35c0c7cf (patch)
tree9da2b42d07e936d124d4718514cf8213bcce74e7 /build/gyp_chromium
parent9a8e9352d12c519c70656ee70b643b67493f1993 (diff)
downloadchromium_src-1e673d00e6c7547e66d6399ed1b5e9cd35c0c7cf.zip
chromium_src-1e673d00e6c7547e66d6399ed1b5e9cd35c0c7cf.tar.gz
chromium_src-1e673d00e6c7547e66d6399ed1b5e9cd35c0c7cf.tar.bz2
Add support for CC and CXX in chromium.gyp_env. These are useful for winja+GOMA.
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/10880023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
-rwxr-xr-xbuild/gyp_chromium4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index ae9ff7d..d134034 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -56,8 +56,10 @@ def apply_gyp_environment(file_path=None):
except SyntaxError, e:
e.filename = os.path.abspath(file_path)
raise
- supported_vars = ( 'CHROMIUM_GYP_FILE',
+ supported_vars = ( 'CC',
+ 'CHROMIUM_GYP_FILE',
'CHROMIUM_GYP_SYNTAX_CHECK',
+ 'CXX',
'GYP_DEFINES',
'GYP_GENERATOR_FLAGS',
'GYP_GENERATOR_OUTPUT',