build/config/linux/pkg_config.gni - Issue 1914103002: GN: Respect system libdir whenever building with the traget sysroot

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/config/linux/pkg_config.gni

Issue 1914103002: GN: Respect system libdir whenever building with the traget sysroot (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

Index: build/config/linux/pkg_config.gni

diff --git a/build/config/linux/pkg_config.gni b/build/config/linux/pkg_config.gni

index f2c7958f119cea632152a419877455b47cca7bd5..004405854b436b67f981a58809633eed2a439483 100644

--- a/build/config/linux/pkg_config.gni

+++ b/build/config/linux/pkg_config.gni

@@ -65,8 +65,8 @@ if (sysroot != "") {

pkg_config_args = []

}

-# Only use the custom libdir when building with the default toolchain.

-if (current_toolchain == default_toolchain) {

+# Only use the custom libdir when building with the target sysroot.

+if (target_sysroot != "" && sysroot == target_sysroot) {

pkg_config_args += [

"--system_libdir",

system_libdir,

« no previous file with comments | « no previous file | no next file » | no next file with comments »