diff options
| author | bors <bors@rust-lang.org> | 2023-03-29 07:16:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-29 07:16:16 +0000 |
| commit | f346fb0bc655acf72e71f1f16065c271447bdbd9 (patch) | |
| tree | 12ee0966b519561621373db1b6d6904e4a41eb90 /src/bootstrap | |
| parent | 40cd0310db7f67867b305c28fb87b5b660e77df1 (diff) | |
| parent | e3968be331aaf7fa48f2365998ed4d076ddc82c8 (diff) | |
| download | rust-f346fb0bc655acf72e71f1f16065c271447bdbd9.tar.gz rust-f346fb0bc655acf72e71f1f16065c271447bdbd9.zip | |
Auto merge of #108792 - Amanieu:ohos, r=petrochenkov
Add OpenHarmony targets - `aarch64-unknown-linux-ohos` - `armv7-unknown-linux-ohos` Compiler team MCP: https://github.com/rust-lang/compiler-team/issues/568
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/llvm.rs | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index ed103a9a51c..2ffad594fc7 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -150,6 +150,8 @@ const EXTRA_CHECK_CFGS: &[(Option<Mode>, &'static str, Option<&[&'static str]>)] // Needed to avoid the need to copy windows.lib into the sysroot. (Some(Mode::Rustc), "windows_raw_dylib", None), (Some(Mode::ToolRustc), "windows_raw_dylib", None), + // #[cfg(bootstrap)] ohos + (Some(Mode::Std), "target_env", Some(&["ohos"])), ]; /// A structure representing a Rust compiler. diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs index de06f8ca8c0..a22f0f04b2e 100644 --- a/src/bootstrap/llvm.rs +++ b/src/bootstrap/llvm.rs @@ -1008,6 +1008,9 @@ fn supported_sanitizers( "aarch64-unknown-linux-gnu" => { common_libs("linux", "aarch64", &["asan", "lsan", "msan", "tsan", "hwasan"]) } + "aarch64-unknown-linux-ohos" => { + common_libs("linux", "aarch64", &["asan", "lsan", "msan", "tsan", "hwasan"]) + } "x86_64-apple-darwin" => darwin_libs("osx", &["asan", "lsan", "tsan"]), "x86_64-unknown-fuchsia" => common_libs("fuchsia", "x86_64", &["asan"]), "x86_64-apple-ios" => darwin_libs("iossim", &["asan", "tsan"]), |