Skip to content

Commit 5f877fb

Browse files
rmacnak-googleCommit Queue
authored andcommitted
Revert "[build] Update to Focal sysroot."
This reverts commit ad9a13a. Reason for revert: breaks Debian arm32 package Original change's description: > [build] Update to Focal sysroot. > > Our minimum supported version is Jammy, which Fuchsia doesn't have a CIPD package for, but at least we no longer need to use a different sysroot for different architectures. > > Change-Id: I90f37797c2f2f79886df85d6b7ed9903270e8c2a > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433561 > Reviewed-by: Alexander Aprelev <[email protected]> > Commit-Queue: Ryan Macnak <[email protected]> No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I532c6052ba9bfe271f34bc18f6120eb80df98d6f Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/433922 Auto-Submit: Ryan Macnak <[email protected]> Commit-Queue: Ryan Macnak <[email protected]> Reviewed-by: Alexander Aprelev <[email protected]>
1 parent 246f211 commit 5f877fb

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

DEPS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,16 @@ deps = {
386386
Var("dart_root") + "/third_party/pkg/web":
387387
Var("dart_git") + "web.git" + "@" + Var("web_rev"),
388388

389+
Var("dart_root") + "/buildtools/sysroot/linux": {
390+
"packages": [
391+
{
392+
"package": "fuchsia/third_party/sysroot/linux",
393+
"version": "git_revision:fa7a5a9710540f30ff98ae48b62f2cdf72ed2acd",
394+
},
395+
],
396+
"condition": "host_os == linux",
397+
"dep_type": "cipd",
398+
},
389399
Var("dart_root") + "/buildtools/sysroot/focal": {
390400
"packages": [
391401
{

build/config/compiler/BUILD.gn

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,13 @@ config("compiler") {
414414
defines = [ "TOOLCHAIN_VERSION=${toolchain_cipd_version.instance_id}" ]
415415

416416
if (is_linux) {
417-
sysroot_stamp_file =
418-
"//buildtools/sysroot/focal/.versions/sysroot.cipd_version"
417+
if (current_cpu == "riscv64") {
418+
sysroot_stamp_file =
419+
"//buildtools/sysroot/focal/.versions/sysroot.cipd_version"
420+
} else {
421+
sysroot_stamp_file =
422+
"//buildtools/sysroot/linux/.versions/sysroot.cipd_version"
423+
}
419424
sysroot_cipd_version = read_file(sysroot_stamp_file, "json")
420425
defines += [ "SYSROOT_VERSION=${sysroot_cipd_version.instance_id}" ]
421426
}

build/config/sysroot.gni

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ if (is_linux) {
3737
assert(false)
3838
}
3939
} else if (dart_sysroot == "debian") {
40-
target_sysroot = rebase_path("//buildtools/sysroot/focal", root_build_dir)
40+
if (current_cpu == "riscv64") {
41+
target_sysroot = rebase_path("//buildtools/sysroot/focal", root_build_dir)
42+
} else {
43+
# Updating to focal would increase the required libc from 2.17 to 2.28.
44+
target_sysroot = rebase_path("//buildtools/sysroot/linux", root_build_dir)
45+
}
4146
} else if (dart_sysroot != "") {
4247
print("There is no $dart_sysroot sysroot support")
4348
assert(false)

0 commit comments

Comments
 (0)