diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 00:32:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 00:32:04 +0000 |
| commit | 537987c53d294d25ed1c45140253bb60883b5e7c (patch) | |
| tree | e8bc0aea14b91259f6872d67a0bf6fe13b3dee1b /build/toolchain | |
| parent | a30b21cd28c48c7bbfe09dcb40b991fff9b3150e (diff) | |
| download | chromium_src-537987c53d294d25ed1c45140253bb60883b5e7c.zip chromium_src-537987c53d294d25ed1c45140253bb60883b5e7c.tar.gz chromium_src-537987c53d294d25ed1c45140253bb60883b5e7c.tar.bz2 | |
GN Command line -D parsing, goma on Windows
This makes gyp_chromium pass defines defined via -D on the command line to GN.
Fixes double-escaping of strings from supplemental.gypi files.
Pass use_goma to the GN build.
Handle "use_goma" and "use_goma=1" (same for other boolean values). Previously values with no equals sign were getting converted to 'true', which doesn't match '1' which we look for.
Output goma wrappers in the GYP header for Windows toolchains.
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/123463005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/toolchain')
| -rw-r--r-- | build/toolchain/win/BUILD.gn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn index 6abf808..ceb0ca8 100644 --- a/build/toolchain/win/BUILD.gn +++ b/build/toolchain/win/BUILD.gn @@ -2,6 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/toolchain/goma.gni") + # Should only be running on Windows. assert(is_win) @@ -26,6 +28,11 @@ exec_script("setup_toolchain.py", [ gyp_win_tool_source ], "value") stamp_command = "$python_path gyp-win-tool stamp \$out" copy_command = "$python_path gyp-win-tool recursive-mirror \$in \$out" +if (use_goma) { + # Add the Goma compiler prefixes to the GYP file. + gyp_header = make_goma_global_settings +} + # 32-bit toolchain ------------------------------------------------------------- toolchain("32") { |