Commit 97f5f9df authored by Tom Anderson's avatar Tom Anderson Committed by Commit Bot

Switch to Debian Stretch sysroot

This CL switches the default sysroot from Jessie to Stretch.
There are no deps changes.  The libstdc++ requirement is not
affected because we do an in-tree build of libc++ instead.
The glibc requirement is also not changed because we don't
currently use any of the symbols from the newer version.

BUG=751812
R=dpranke@chromium.org,thestig@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_chromium_archive_rel_ng;master.tryserver.chromium.linux:linux_arm

Change-Id: I89da578852fe0f7bfd27ffc08fda99e3b4df239e
Reviewed-on: https://chromium-review.googlesource.com/598737Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#516093}
parent 85a46538
...@@ -40,7 +40,9 @@ if (current_os == target_os && current_cpu == target_cpu && ...@@ -40,7 +40,9 @@ if (current_os == target_os && current_cpu == target_cpu &&
} else { } else {
assert(false, "No android sysroot for cpu: $target_cpu") assert(false, "No android sysroot for cpu: $target_cpu")
} }
} else if (is_chromeos && use_sysroot) { } else if (is_linux && use_sysroot) {
# By default build against a sysroot image downloaded from Cloud Storage
# during gclient runhooks.
if (current_cpu == "x64") { if (current_cpu == "x64") {
sysroot = "$target_sysroot_dir/debian_stretch_amd64-sysroot" sysroot = "$target_sysroot_dir/debian_stretch_amd64-sysroot"
} else if (current_cpu == "x86") { } else if (current_cpu == "x86") {
...@@ -51,22 +53,6 @@ if (current_os == target_os && current_cpu == target_cpu && ...@@ -51,22 +53,6 @@ if (current_os == target_os && current_cpu == target_cpu &&
sysroot = "$target_sysroot_dir/debian_stretch_arm-sysroot" sysroot = "$target_sysroot_dir/debian_stretch_arm-sysroot"
} else if (current_cpu == "arm64") { } else if (current_cpu == "arm64") {
sysroot = "$target_sysroot_dir/debian_stretch_arm64-sysroot" sysroot = "$target_sysroot_dir/debian_stretch_arm64-sysroot"
} else {
assert(false, "No chromeos sysroot for cpu: $target_cpu")
}
} else if (is_linux && use_sysroot) {
# By default build against a sysroot image downloaded from Cloud Storage
# during gclient runhooks.
if (current_cpu == "x64") {
sysroot = "$target_sysroot_dir/debian_jessie_amd64-sysroot"
} else if (current_cpu == "x86") {
sysroot = "$target_sysroot_dir/debian_jessie_i386-sysroot"
} else if (current_cpu == "mipsel") {
sysroot = "$target_sysroot_dir/debian_jessie_mips-sysroot"
} else if (current_cpu == "arm") {
sysroot = "$target_sysroot_dir/debian_jessie_arm-sysroot"
} else if (current_cpu == "arm64") {
sysroot = "$target_sysroot_dir/debian_jessie_arm64-sysroot"
} else { } else {
assert(false, "No linux sysroot for cpu: $target_cpu") assert(false, "No linux sysroot for cpu: $target_cpu")
} }
......
...@@ -159,19 +159,13 @@ def main(args): ...@@ -159,19 +159,13 @@ def main(args):
print 'You much specify either --arch, --all or --running-as-hook' print 'You much specify either --arch, --all or --running-as-hook'
return 1 return 1
# Desktop Chromium OS builds require the stretch sysroot.
# TODO(thomasanderson): only download this when the GN arg target_os
# == 'chromeos', when the functionality to perform the check becomes
# available.
InstallSysroot('Stretch', 'amd64')
return 0 return 0
def InstallDefaultSysrootForArch(target_arch): def InstallDefaultSysrootForArch(target_arch):
if target_arch not in VALID_ARCHS: if target_arch not in VALID_ARCHS:
raise Error('Unknown architecture: %s' % target_arch) raise Error('Unknown architecture: %s' % target_arch)
InstallSysroot('Jessie', target_arch) InstallSysroot('Stretch', target_arch)
def InstallSysroot(target_platform, target_arch): def InstallSysroot(target_platform, target_arch):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment