| Index: base/BUILD.gn
|
| diff --git a/base/BUILD.gn b/base/BUILD.gn
|
| index 1fe0aa3d3eb14fcfb5dac27df2d67e1d92c33529..b3df12e1d611bafad9739fb2c155da439730567f 100644
|
| --- a/base/BUILD.gn
|
| +++ b/base/BUILD.gn
|
| @@ -124,14 +124,12 @@
|
| # test code (test support and anything in the test directory) which should use
|
| # source_set as is recommended for GN targets).
|
| component("base") {
|
| - if (is_nacl_nonsfi) {
|
| - # TODO(phosek) bug 570839: If field_trial.cc is in a static library,
|
| - # hacl_helper_nonsfi doesn't link properly on Linux in debug builds. The
|
| - # reasons for this seem to involve obscure toolchain bugs. This should be
|
| - # fixed and this target should always be a static_library in the
|
| - # non-component case.
|
| - static_component_type = "source_set"
|
| - }
|
| + # TODO(phosek) bug 570839: If field_trial.cc is in a static library,
|
| + # hacl_helper_nonsfi doesn't link properly on Linux in debug builds. The
|
| + # reasons for this seem to involve obscure toolchain bugs. This should be
|
| + # fixed and this target should always be a static_library in the
|
| + # non-component case.
|
| + component_never_use_source_set = !is_nacl_nonsfi
|
|
|
| sources = [
|
| "allocator/allocator_check.cc",
|
|
|