diff options
| author |  mtklein <mtklein@chromium.org> | 2016-08-24 17:32:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-24 17:32:30 -0700 |
| commit | 9b8583dd1f18657c08eaab047d79288b9f2c61a7 (patch) | |
| tree | 3c7ae56a4998e18711df7d1ee48b385c24551cc5 /gn | |
| parent | f84960187ab40281bc4aacf5f6a485579a46f953 (diff) | |
GN: misc
- Use options' template pattern for opts too.
- Simplify opt's and options' configs... they should all be the same.
- When building a static-library component in our GN environment (i.e. libskia.a),
make it a complete static lib, fully containing its transitive deps.
- It has not proved useful to override ar.
TBR=jcgregorio@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2278673002
Review-Url: https://codereview.chromium.org/2278673002
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/BUILD.gn | 5 | ||||
| -rw-r--r-- | gn/BUILDCONFIG.gn | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn index cea57454a9..fecca8efe8 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -4,7 +4,6 @@ # found in the LICENSE file. declare_args() { - ar = "ar" cc = "cc" cxx = "c++" @@ -97,13 +96,13 @@ toolchain("gcc_like") { } tool("alink") { - command = "rm -f {{output}} && $ar rcs {{output}} {{inputs}}" + command = "rm -f {{output}} && ar rcs {{output}} {{inputs}}" outputs = [ "{{root_out_dir}}/{{target_output_name}}{{output_extension}}", ] default_output_extension = ".a" output_prefix = "lib" - description = "$ar {{output}} ..." + description = "ar {{output}} ..." } tool("solink") { diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn index 2daba29481..d6833571c8 100644 --- a/gn/BUILDCONFIG.gn +++ b/gn/BUILDCONFIG.gn @@ -73,6 +73,9 @@ set_defaults("shared_library") { set_defaults("component") { configs = default_configs + if (!is_component_build) { + complete_static_lib = true + } } # For now, we support GCC-like toolchains, including Clang. |