| commit | 45583c7e7cbf700efd503ee2fb6a956740bb7b65 | [log] [tgz] |
|---|---|---|
| author | Tom Anderson <[email protected]> | Sat Jul 08 02:53:34 2017 |
| committer | Commit Bot <[email protected]> | Sat Jul 08 02:53:34 2017 |
| tree | 23fd1ac68fe47a82ac75ce68e0388817fdb4b42d | |
| parent | 3128fe4c0e142cccc214cdd002f661eea34f7417 [diff] |
Add dependency on libc++ from linux packaging build files Patch thanks to [email protected]! BUG=593874 [email protected] [email protected] [email protected] Change-Id: If554b0e1ed1d40386e7a639dc9b8869225500b51 Reviewed-on: https://chromium-review.googlesource.com/564284 Commit-Queue: Thomas Anderson <[email protected]> Reviewed-by: Lei Zhang <[email protected]> Cr-Commit-Position: refs/heads/master@{#485135}
diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn index 292e1e4d..315f8b6 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn
@@ -190,6 +190,14 @@ if (!is_chromeos) { public_deps += [ ":rpm_packaging_files" ] } + + # 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) { + public_deps += [ "//buildtools/third_party/libc++:libc++" ] + } } # Creates .deb and .rpm (RPM for non-ChromeOS only) installer packages.