diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:30:34 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-08 21:30:34 +0000 |
commit | 7ff2f5d2929d13bec977e4cd2cd5646413b2a592 (patch) | |
tree | d4edd94a70647061bd05ce50dee01b5fb928e0cb /tools/gn/secondary/build | |
parent | 75ed8829d991b62b4943a29b0140d6803a70cac1 (diff) | |
download | chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.zip chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.tar.gz chromium_src-7ff2f5d2929d13bec977e4cd2cd5646413b2a592.tar.bz2 |
Add the concept of a source set to GN.
A source set acts like a static library in most cases, but doesn't actually make the library. The object files will be added to targets that depend on it.
I changed the default component mode to be a "source set" rather than a shared library in non-component mode.
This fixes the script target writer unit test on Windows.
BUG=
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/26267003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn/secondary/build')
-rw-r--r-- | tools/gn/secondary/build/config/BUILDCONFIG.gn | 6 | ||||
-rw-r--r-- | tools/gn/secondary/build/toolchain/nacl/BUILD.gn | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/tools/gn/secondary/build/config/BUILDCONFIG.gn b/tools/gn/secondary/build/config/BUILDCONFIG.gn index e48f896..d2e609d 100644 --- a/tools/gn/secondary/build/config/BUILDCONFIG.gn +++ b/tools/gn/secondary/build/config/BUILDCONFIG.gn @@ -162,7 +162,7 @@ set_sources_assignment_filter(sources_assignment_filter) if (is_component_build) { component_mode = "shared_library" } else { - component_mode = "static_library" + component_mode = "source_set" } toolkit_uses_gtk = is_linux @@ -266,6 +266,10 @@ set_defaults("shared_library") { } } +set_defaults("source_set") { + configs = native_compiler_configs +} + # ============================================================================== # TOOLCHAIN SETUP # ============================================================================== diff --git a/tools/gn/secondary/build/toolchain/nacl/BUILD.gn b/tools/gn/secondary/build/toolchain/nacl/BUILD.gn index 2e2fc7f..b5fe248 100644 --- a/tools/gn/secondary/build/toolchain/nacl/BUILD.gn +++ b/tools/gn/secondary/build/toolchain/nacl/BUILD.gn @@ -38,6 +38,18 @@ toolchain("x86_newlib") { #pool = "link_pool" } + if (is_win) { + tool("stamp") { + command = "$python_path gyp-win-tool stamp \$out" + description = "STAMP \$out" + } + } else { + tool("stamp") { + command = "touch \$out" + description = "STAMP \$out" + } + } + toolchain_args() { is_nacl = true |