[rust_toolchain] Add thumbv7m-none-eabi target
Change-Id: I842a4be6678b2ca9bb6313daa694fa01f1423050
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/862827
Presubmit-Verified: CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Joseph Ryan <josephry@google.com>
Fuchsia-Auto-Submit: Tyler Mandry <tmandry@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
diff --git a/recipes/contrib/rust_toolchain.expected/failing_compile_tests.json b/recipes/contrib/rust_toolchain.expected/failing_compile_tests.json
index 8f6f966..545ec37 100644
--- a/recipes/contrib/rust_toolchain.expected/failing_compile_tests.json
+++ b/recipes/contrib/rust_toolchain.expected/failing_compile_tests.json
@@ -2599,6 +2599,159 @@
"RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
"read_manifests",
"--manifests",
+ "manifest-rust-std-thumbv7m-none-eabi",
+ "--pkg-dir",
+ "[START_DIR]/staging/rust"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "generate target manifest file paths for thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@raw_io.output_text[package-manifest]@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "cipd (5)",
+ "~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
+ "@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-build",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/target_thumbv7m-none-eabi.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\", \"root\": \"[START_DIR]/staging/rust\"}",
+ "-out",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-hash-algo",
+ "sha256",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).build fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "search",
+ "fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "-tag",
+ "git_revision:deadbeef",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).cipd search fuchsia/third_party/rust/target/thumbv7m-none-eabi git_revision:deadbeef",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-register",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-ref",
+ "latest",
+ "-tag",
+ "git_revision:deadbeef",
+ "-tag",
+ "ref:refs/heads/main",
+ "-tag",
+ "version:1.19.0-nightly",
+ "-metadata",
+ "bbid:8945511751514863184",
+ "-metadata",
+ "git_repository:https://fuchsia.googlesource.com/third_party/rust",
+ "-metadata",
+ "ref:refs/heads/main",
+ "-metadata",
+ "version:1.19.0-nightly",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).register fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@fuchsia/third_party/rust/target/thumbv7m-none-eabi@https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/rust/target/thumbv7m-none-eabi/+/40-chars-fake-of-the-package-instance_id@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+ "RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
+ "read_manifests",
+ "--manifests",
"manifest-cargo,manifest-clippy-preview,manifest-rust-analyzer-preview,manifest-rustc,manifest-rust-demangler-preview,manifest-rustfmt-preview,manifest-rust-src",
"--pkg-dir",
"[START_DIR]/staging/rust"
@@ -2622,7 +2775,7 @@
},
{
"cmd": [],
- "name": "cipd (5)",
+ "name": "cipd (6)",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
@@ -2636,7 +2789,7 @@
"-pkg-def",
"{\"data\": [{\"file\": \"bin/llvm-profdata\"}, {\"version_file\": \".versions/rust.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/host/linux-amd64\", \"root\": \"[START_DIR]/staging/rust\"}",
"-out",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-hash-algo",
"sha256",
"-json-output",
@@ -2654,7 +2807,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).build fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).build fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2688,7 +2841,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
+ "name": "cipd (6).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2701,7 +2854,7 @@
"cmd": [
"cipd",
"pkg-register",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-ref",
"latest",
"-tag",
@@ -2733,7 +2886,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).register fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).register fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/rust_toolchain.expected/manual.json b/recipes/contrib/rust_toolchain.expected/manual.json
index 38971e6..99cf207 100644
--- a/recipes/contrib/rust_toolchain.expected/manual.json
+++ b/recipes/contrib/rust_toolchain.expected/manual.json
@@ -1600,6 +1600,105 @@
"RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
"read_manifests",
"--manifests",
+ "manifest-rust-std-thumbv7m-none-eabi",
+ "--pkg-dir",
+ "[START_DIR]/staging/rust"
+ ],
+ "name": "generate target manifest file paths for thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@raw_io.output_text[package-manifest]@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "cipd (5)",
+ "~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
+ "@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-build",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/target_thumbv7m-none-eabi.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\", \"root\": \"[START_DIR]/staging/rust\"}",
+ "-out",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-hash-algo",
+ "sha256",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "cipd (5).build fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "search",
+ "fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "-tag",
+ "git_revision:deadbeef",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "cipd (5).cipd search fuchsia/third_party/rust/target/thumbv7m-none-eabi git_revision:deadbeef",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-register",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-tag",
+ "git_revision:deadbeef",
+ "-tag",
+ "version:1.19.0-nightly",
+ "-metadata",
+ "bbid:0",
+ "-metadata",
+ "git_repository:https://fuchsia.googlesource.com/third_party/rust",
+ "-metadata",
+ "version:1.19.0-nightly",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "name": "cipd (5).register fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@fuchsia/third_party/rust/target/thumbv7m-none-eabi@https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/rust/target/thumbv7m-none-eabi/+/40-chars-fake-of-the-package-instance_id@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+ "RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
+ "read_manifests",
+ "--manifests",
"manifest-cargo,manifest-clippy-preview,manifest-rust-analyzer-preview,manifest-rustc,manifest-rust-demangler-preview,manifest-rustfmt-preview,manifest-rust-src",
"--pkg-dir",
"[START_DIR]/staging/rust"
@@ -1611,7 +1710,7 @@
},
{
"cmd": [],
- "name": "cipd (5)",
+ "name": "cipd (6)",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
@@ -1625,13 +1724,13 @@
"-pkg-def",
"{\"data\": [{\"file\": \"bin/llvm-profdata\"}, {\"version_file\": \".versions/rust.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/host/linux-amd64\", \"root\": \"[START_DIR]/staging/rust\"}",
"-out",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-hash-algo",
"sha256",
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd (5).build fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).build fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1653,7 +1752,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd (5).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
+ "name": "cipd (6).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1666,7 +1765,7 @@
"cmd": [
"cipd",
"pkg-register",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-tag",
"git_revision:deadbeef",
"-tag",
@@ -1680,7 +1779,7 @@
"-json-output",
"/path/to/tmp/json"
],
- "name": "cipd (5).register fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).register fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_beta.json b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_beta.json
index 8f640da..e045d84 100644
--- a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_beta.json
+++ b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_beta.json
@@ -2704,6 +2704,159 @@
"RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
"read_manifests",
"--manifests",
+ "manifest-rust-std-thumbv7m-none-eabi",
+ "--pkg-dir",
+ "[START_DIR]/staging/rust"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "generate target manifest file paths for thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@raw_io.output_text[package-manifest]@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "cipd (5)",
+ "~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
+ "@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-build",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/target_thumbv7m-none-eabi.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\", \"root\": \"[START_DIR]/staging/rust\"}",
+ "-out",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-hash-algo",
+ "sha256",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).build fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "search",
+ "fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "-tag",
+ "git_revision:deadbeef",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).cipd search fuchsia/third_party/rust/target/thumbv7m-none-eabi git_revision:deadbeef",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-register",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-ref",
+ "latest_beta",
+ "-tag",
+ "git_revision:deadbeef",
+ "-tag",
+ "ref:refs/heads/upstream/beta",
+ "-tag",
+ "version:1.19.0-nightly",
+ "-metadata",
+ "bbid:8945511751514863184",
+ "-metadata",
+ "git_repository:https://fuchsia.googlesource.com/third_party/rust",
+ "-metadata",
+ "ref:refs/heads/upstream/beta",
+ "-metadata",
+ "version:1.19.0-nightly",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).register fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@fuchsia/third_party/rust/target/thumbv7m-none-eabi@https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/rust/target/thumbv7m-none-eabi/+/40-chars-fake-of-the-package-instance_id@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+ "RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
+ "read_manifests",
+ "--manifests",
"manifest-cargo,manifest-clippy-preview,manifest-rust-analyzer-preview,manifest-rustc,manifest-rust-demangler-preview,manifest-rustfmt-preview,manifest-rust-src",
"--pkg-dir",
"[START_DIR]/staging/rust"
@@ -2728,7 +2881,7 @@
},
{
"cmd": [],
- "name": "cipd (5)",
+ "name": "cipd (6)",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
@@ -2742,7 +2895,7 @@
"-pkg-def",
"{\"data\": [{\"file\": \"relative/file/path\"}, {\"file\": \"bin/llvm-profdata\"}, {\"version_file\": \".versions/rust.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/host/linux-amd64\", \"root\": \"[START_DIR]/staging/rust\"}",
"-out",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-hash-algo",
"sha256",
"-json-output",
@@ -2760,7 +2913,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).build fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).build fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2794,7 +2947,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
+ "name": "cipd (6).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2807,7 +2960,7 @@
"cmd": [
"cipd",
"pkg-register",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-ref",
"latest_beta",
"-tag",
@@ -2839,7 +2992,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).register fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).register fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_full.json b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_full.json
index 99a8e39..deb7b43 100644
--- a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_full.json
+++ b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_full.json
@@ -2678,6 +2678,159 @@
"RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
"read_manifests",
"--manifests",
+ "manifest-rust-std-thumbv7m-none-eabi",
+ "--pkg-dir",
+ "[START_DIR]/staging/rust"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "generate target manifest file paths for thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@raw_io.output_text[package-manifest]@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "cipd (5)",
+ "~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
+ "@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-build",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/target_thumbv7m-none-eabi.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\", \"root\": \"[START_DIR]/staging/rust\"}",
+ "-out",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-hash-algo",
+ "sha256",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).build fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "search",
+ "fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "-tag",
+ "git_revision:deadbeef",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).cipd search fuchsia/third_party/rust/target/thumbv7m-none-eabi git_revision:deadbeef",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-register",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-ref",
+ "latest",
+ "-tag",
+ "git_revision:deadbeef",
+ "-tag",
+ "ref:refs/heads/main",
+ "-tag",
+ "version:1.19.0-nightly",
+ "-metadata",
+ "bbid:8945511751514863184",
+ "-metadata",
+ "git_repository:https://fuchsia.googlesource.com/third_party/rust",
+ "-metadata",
+ "ref:refs/heads/main",
+ "-metadata",
+ "version:1.19.0-nightly",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).register fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@fuchsia/third_party/rust/target/thumbv7m-none-eabi@https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/rust/target/thumbv7m-none-eabi/+/40-chars-fake-of-the-package-instance_id@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+ "RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
+ "read_manifests",
+ "--manifests",
"manifest-cargo,manifest-clippy-preview,manifest-rust-analyzer-preview,manifest-rustc,manifest-rust-demangler-preview,manifest-rustfmt-preview,manifest-rust-src",
"--pkg-dir",
"[START_DIR]/staging/rust"
@@ -2701,7 +2854,7 @@
},
{
"cmd": [],
- "name": "cipd (5)",
+ "name": "cipd (6)",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
@@ -2715,7 +2868,7 @@
"-pkg-def",
"{\"data\": [{\"file\": \"bin/llvm-profdata\"}, {\"version_file\": \".versions/rust.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/host/linux-amd64\", \"root\": \"[START_DIR]/staging/rust\"}",
"-out",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-hash-algo",
"sha256",
"-json-output",
@@ -2733,7 +2886,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).build fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).build fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2767,7 +2920,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
+ "name": "cipd (6).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2780,7 +2933,7 @@
"cmd": [
"cipd",
"pkg-register",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-ref",
"latest",
"-tag",
@@ -2812,7 +2965,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).register fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).register fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_main.json b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_main.json
index e389e05..12e042f 100644
--- a/recipes/contrib/rust_toolchain.expected/rust_intel_linux_main.json
+++ b/recipes/contrib/rust_toolchain.expected/rust_intel_linux_main.json
@@ -2704,6 +2704,159 @@
"RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
"read_manifests",
"--manifests",
+ "manifest-rust-std-thumbv7m-none-eabi",
+ "--pkg-dir",
+ "[START_DIR]/staging/rust"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "generate target manifest file paths for thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_LOG_END@raw_io.output_text[package-manifest]@@@"
+ ]
+ },
+ {
+ "cmd": [],
+ "name": "cipd (5)",
+ "~followup_annotations": [
+ "@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
+ "@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
+ "@@@SET_BUILD_PROPERTY@package@\"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-build",
+ "-pkg-def",
+ "{\"data\": [{\"dir\": \".\", \"exclude\": []}, {\"version_file\": \".versions/target_thumbv7m-none-eabi.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\", \"root\": \"[START_DIR]/staging/rust\"}",
+ "-out",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-hash-algo",
+ "sha256",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).build fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "search",
+ "fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "-tag",
+ "git_revision:deadbeef",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).cipd search fuchsia/third_party/rust/target/thumbv7m-none-eabi git_revision:deadbeef",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": []@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "cipd",
+ "pkg-register",
+ "[CLEANUP]/cipd-util-build_tmp_5/target_thumbv7m-none-eabi.pkg",
+ "-ref",
+ "latest",
+ "-tag",
+ "git_revision:deadbeef",
+ "-tag",
+ "ref:refs/heads/main",
+ "-tag",
+ "version:1.19.0-nightly",
+ "-metadata",
+ "bbid:8945511751514863184",
+ "-metadata",
+ "git_repository:https://fuchsia.googlesource.com/third_party/rust",
+ "-metadata",
+ "ref:refs/heads/main",
+ "-metadata",
+ "version:1.19.0-nightly",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "fuchsia:ci"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "cipd (5).register fuchsia/third_party/rust/target/thumbv7m-none-eabi",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/third_party/rust/target/thumbv7m-none-eabi\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@",
+ "@@@STEP_LINK@fuchsia/third_party/rust/target/thumbv7m-none-eabi@https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/rust/target/thumbv7m-none-eabi/+/40-chars-fake-of-the-package-instance_id@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+ "RECIPE[fuchsia::contrib/rust_toolchain].resources/generate_manifest_file_paths.py",
+ "read_manifests",
+ "--manifests",
"manifest-cargo,manifest-clippy-preview,manifest-rust-analyzer-preview,manifest-rustc,manifest-rust-demangler-preview,manifest-rustfmt-preview,manifest-rust-src",
"--pkg-dir",
"[START_DIR]/staging/rust"
@@ -2728,7 +2881,7 @@
},
{
"cmd": [],
- "name": "cipd (5)",
+ "name": "cipd (6)",
"~followup_annotations": [
"@@@SET_BUILD_PROPERTY@git_revision@\"deadbeef\"@@@",
"@@@SET_BUILD_PROPERTY@instance_id@\"40-chars-fake-of-the-package-instance_id\"@@@",
@@ -2742,7 +2895,7 @@
"-pkg-def",
"{\"data\": [{\"file\": \"relative/file/path\"}, {\"file\": \"bin/llvm-profdata\"}, {\"version_file\": \".versions/rust.cipd_version\"}], \"install_mode\": \"copy\", \"package\": \"fuchsia/third_party/rust/host/linux-amd64\", \"root\": \"[START_DIR]/staging/rust\"}",
"-out",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-hash-algo",
"sha256",
"-json-output",
@@ -2760,7 +2913,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).build fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).build fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2794,7 +2947,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
+ "name": "cipd (6).cipd search fuchsia/third_party/rust/host/linux-amd64 git_revision:deadbeef",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -2807,7 +2960,7 @@
"cmd": [
"cipd",
"pkg-register",
- "[CLEANUP]/cipd-util-build_tmp_5/rust.pkg",
+ "[CLEANUP]/cipd-util-build_tmp_6/rust.pkg",
"-ref",
"latest",
"-tag",
@@ -2839,7 +2992,7 @@
"hostname": "rdbhost"
}
},
- "name": "cipd (5).register fuchsia/third_party/rust/host/linux-amd64",
+ "name": "cipd (6).register fuchsia/third_party/rust/host/linux-amd64",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/rust_toolchain.py b/recipes/contrib/rust_toolchain.py
index 51b4833..6d7210a 100644
--- a/recipes/contrib/rust_toolchain.py
+++ b/recipes/contrib/rust_toolchain.py
@@ -388,6 +388,7 @@
"aarch64-unknown-linux-gnu",
"x86_64-unknown-linux-gnu",
"wasm32-unknown-unknown",
+ "thumbv7m-none-eabi",
],
"linux-arm64": [],
"mac-amd64": [
diff --git a/recipes/contrib/rust_toolchain.resources/generate_config.py b/recipes/contrib/rust_toolchain.resources/generate_config.py
index 4c3a182..4489b7b 100644
--- a/recipes/contrib/rust_toolchain.resources/generate_config.py
+++ b/recipes/contrib/rust_toolchain.resources/generate_config.py
@@ -56,7 +56,7 @@
thin-lto = {thinlto}
ccache = {gomacc_quote}
ninja = true
-targets = "X86;AArch64;RISCV;WebAssembly"
+targets = "AArch64;ARM;RISCV;WebAssembly;X86"
{cmake_settings}
use-libcxx = true
# TODO(https://github.com/rust-lang/rust/issues/94983)
@@ -234,10 +234,10 @@
if args.win_sysroot:
target_sysroots.update({"x86_64-pc-windows-msvc": args.win_sysroot})
- # Configure non-Fuchsia targets.
+ # Configure non-Fuchsia target sysroots.
for target in args.targets.split(","):
- if "wasm32" in target or "windows" in target:
- # Skip setting sysroots for wasm32 and windows.
+ # These are the only targets we define a sysroot for.
+ if not ("linux" in target or "apple" in target):
continue
sysroot = target_sysroots[target]
triple_lower = target.replace("-", "_").lower()
@@ -326,6 +326,7 @@
"x86_64-unknown-linux-gnu",
"aarch64-unknown-linux-gnu",
"wasm32-unknown-unknown",
+ "thumbv7m-none-eabi",
]
if is_mac:
default_targets.append("aarch64-apple-darwin")
