diff options
Diffstat (limited to 'chromium/build/config/gcc/BUILD.gn')
| -rw-r--r-- | chromium/build/config/gcc/BUILD.gn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/build/config/gcc/BUILD.gn b/chromium/build/config/gcc/BUILD.gn index f1950bfec32..4b4d6fe795c 100644 --- a/chromium/build/config/gcc/BUILD.gn +++ b/chromium/build/config/gcc/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/compiler/compiler.gni") import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sysroot.gni") @@ -110,7 +111,7 @@ config("executable_ldconfig") { } else { # See the rpath_for... config above for why this is necessary for component # builds. Sanitizers use a custom libc++ where this is also necessary. - if (is_component_build || using_sanitizer) { + if (is_component_build || using_sanitizer || !libcpp_is_static) { configs = [ ":rpath_for_built_shared_libraries" ] } if (current_cpu == "mipsel" || current_cpu == "mips64el") { @@ -127,7 +128,7 @@ config("executable_ldconfig") { _rpath_link += "/$shlib_subdir" } if (is_android) { - _rebased_sysroot = rebase_path(sysroot, root_build_dir) + _rebased_sysroot = rebase_path(link_sysroot, root_build_dir) _rpath_link += ":$_rebased_sysroot/usr/lib" } |