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

Unified Diff: build/config/sysroot.gni

Issue 2096323002: Fix for cross compiling 32bit linux on 64bit host machine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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: build/config/sysroot.gni
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index 038921eee935add178592f597e7daf312fbd2242..b815d2ac6507c0190649b18efba279737b3d9502 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -11,11 +11,21 @@ declare_args() {
# The absolute path of the sysroot that is applied when compiling using
# the target toolchain.
target_sysroot = ""
+
+ # The absolute path to directory containing sysroots for linux 32 and 64bit
+ target_sysroot_dir = ""
+
use_sysroot = true
}
-if (current_os == target_os && current_cpu == target_cpu &&
- target_sysroot != "") {
+if (is_linux && target_sysroot_dir != "") {
+ if (current_cpu == "x64") {
+ sysroot = target_sysroot_dir + "/wheezy-x64"
+ } else if (current_cpu == "x86") {
+ sysroot = target_sysroot_dir + "/wheezy-ia32"
+ }
+} else 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 »

Powered by Google App Engine
This is Rietveld 408576698