Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3111)

Unified Diff: content/shell/BUILD.gn

Issue 1781903002: Set rpath to let content_shell find our own libfreetype (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/BUILD.gn
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 3606271d86dec4e16e934fb3ba220bc04f5b7631..c356cab72cd0170f81011662ba137ed0882bd804 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -462,6 +462,11 @@ if (!is_android && !is_mac) {
"//tools/imagediff($host_toolchain)",
]
}
+
+ if (is_linux && !is_component_build) {
+ # Set rpath to find our own libfreetype even in a non-component build.
+ configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+ }
Dirk Pranke 2016/03/10 01:37:12 This is basically the right fix, but I think it mi
Mike West 2016/03/10 08:46:46 I'd be fine with that.
Xianzhu 2016/03/10 17:31:26 I think the current method is better because: - It
}
} else {
group("content_shell") {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698