diff options
| author | Jordan Bayles <jophba@chromium.org> | 2020-04-23 11:26:12 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-23 19:41:10 +0000 |
| commit | f3152ffe484c8b562fb01c6fcd404c7c15d41056 (patch) | |
| tree | 8e4753562e889aa7e47a8c826871312a162d16bf /build/config/sysroot.gni | |
| parent | 9a95cc089fbb642906eafad7d9cb028a9a74465e (diff) | |
| download | openscreen-f3152ffe484c8b562fb01c6fcd404c7c15d41056.tar.gz | |
Readd Debian stretch for bot compilation
Currently the ARM64 bots are using too new of a version of glib, so they
are incompatible with all of the bots in the luci.flex.try pool that run
ARM64.
This patch readds the Debian stretch sysroot for cross compiling, so we
link an older version of glib that is either the same or forwards
compatible with the newer version linked in the Ubuntu 18.04 bots.
Bug: openscreen/18
Change-Id: I3ada49ac5197844b0c49028194a17c993c7b2663
TBR=btolsch@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2163436
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'build/config/sysroot.gni')
| -rw-r--r-- | build/config/sysroot.gni | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index 8ce9455a..deecdeca 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -12,20 +12,28 @@ declare_args() { target_sysroot_dir = "../" use_sysroot = current_cpu == "arm" || current_cpu == "arm64" + + sysroot_platform = "sid" } if (use_sysroot) { + assert(sysroot_platform == "sid" || sysroot_platform == "stretch") assert(current_cpu == "arm" || current_cpu == "arm64") # By default build against a sysroot image downloaded from Cloud Storage # during gclient runhooks. - sysroot = "${target_sysroot_dir}/debian_sid_${current_cpu}-sysroot" + sysroot = + "${target_sysroot_dir}/debian_${sysroot_platform}_${current_cpu}-sysroot" _script_arch = current_cpu if (exec_script("//build/scripts/dir_exists.py", [ rebase_path(sysroot) ], "string") != "True") { print("Missing or outdated sysroot for $current_cpu, downloading latest...") - exec_script("//build/scripts/install-sysroot.py", [ "$current_cpu" ]) + exec_script("//build/scripts/install-sysroot.py", + [ + "$current_cpu", + "$sysroot_platform", + ]) } } |