| Index: chrome/installer/linux/BUILD.gn
|
| diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn
|
| index d8fd944ab6b5761f5c2ff63b16163393d657704e..8f05ba39dc780ff57a8a4fe9aa9441b45cafe5ef 100644
|
| --- a/chrome/installer/linux/BUILD.gn
|
| +++ b/chrome/installer/linux/BUILD.gn
|
| @@ -2,6 +2,7 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import("//build/config/c++/c++.gni")
|
| import("//build/config/chrome_build.gni")
|
| import("//build/config/features.gni")
|
| import("//build/config/sanitizers/sanitizers.gni")
|
| @@ -193,9 +194,6 @@ group("installer_deps") {
|
| if (!is_chromeos) {
|
| public_deps += [ ":rpm_packaging_files" ]
|
| }
|
| - if (use_custom_libcxx) {
|
| - public_deps += [ "//buildtools/third_party/libc++" ]
|
| - }
|
| }
|
|
|
| # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.
|
| @@ -242,7 +240,11 @@ template("linux_package") {
|
| ]
|
| }
|
|
|
| - if (use_custom_libcxx) {
|
| + # TODO(thomasanderson): Move this variable into a .gni file
|
| + # somewhere. It is currently copied from
|
| + # buildtools/third_party/libc++/BUILD.gn.
|
| + libcpp_is_static = !is_component_build && !using_sanitizer
|
| + if (!libcpp_is_static && use_custom_libcxx) {
|
| packaging_files_binaries += [ "$root_out_dir/libc++.so" ]
|
| }
|
|
|
|
|