build/config/sysroot.gni - Issue 1901353002: Use target_sysroot when building for target OS on target CPU

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/sysroot.gni

Issue 1901353002: Use target_sysroot when building for target OS on target CPU (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert !is_chromeos 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/sysroot.gni

diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni

index dcd215a345c7267ac9f0172fefe2a698c3380ea6..44ded33e42cf4e4b9eb2fedb920c1eeaa7af72b7 100644

--- a/build/config/sysroot.gni

+++ b/build/config/sysroot.gni

@@ -14,7 +14,8 @@ declare_args() {

use_sysroot = true

}

-if (current_toolchain == default_toolchain && target_sysroot != "") {

+if (current_os == target_os && current_cpu == target_cpu &&

+ target_sysroot != "") {

sysroot = target_sysroot

} else if (is_android) {

import("//build/config/android/config.gni")

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