blob: 8a0a56a8f241436227509f546c4f76662c3e2ce6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
|
diff --git a/src/3rdparty/chromium/build/config/gcc/BUILD.gn b/src/3rdparty/chromium/build/config/gcc/BUILD.gn
index 147ebfc53..0febdd592 100644
--- a/src/3rdparty/chromium/build/config/gcc/BUILD.gn
+++ b/src/3rdparty/chromium/build/config/gcc/BUILD.gn
@@ -66,7 +66,7 @@ config("rpath_for_built_shared_libraries") {
if (!is_android && current_os != "aix" && !is_castos) {
# Note: Android, Aix don't support rpath. Chromecast has its own logic for
# setting the rpath in //build/config/chromecast.
- if (current_toolchain != default_toolchain || gcc_target_rpath == "") {
+ if (gcc_target_rpath == "") {
ldflags = [
# Want to pass "\$". GN will re-escape as required for ninja.
"-Wl,-rpath=\$ORIGIN",
@@ -80,7 +80,7 @@ config("rpath_for_built_shared_libraries") {
}
}
-if (is_component_build && !is_android) {
+if (!is_android) {
# See the rpath_for... config above for why this is necessary for component
# builds.
executable_and_shared_library_configs_ =
|
