diff options
| author | bors <bors@rust-lang.org> | 2025-03-16 18:42:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-16 18:42:18 +0000 |
| commit | 227690a258492c84ae9927d18289208d0180e62f (patch) | |
| tree | ff93010bb7b6b688654576d4eecdde80905568c6 /compiler/rustc_llvm/build.rs | |
| parent | 8b87fefd76665236a304d3c0998e1021710ce1b0 (diff) | |
| parent | 4cd350f61639d66095a9c5c87e6ff574ad1f7a00 (diff) | |
| download | rust-227690a258492c84ae9927d18289208d0180e62f.tar.gz rust-227690a258492c84ae9927d18289208d0180e62f.zip | |
Auto merge of #137011 - LuuuXXX:promote-ohos-with-host-tools, r=Amanieu
Promote ohos targets to tier2 with host tools. ### What does this PR try to resolve? Try to promote the following [[Tier 2 without Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-without-host-tools) targets to [[Tier 2 with Host Tools](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools)](https://doc.rust-lang.org/rustc/platform-support.html#tier-2-with-host-tools): - `aarch64-unknown-linux-ohos` - `armv7-unknown-linux-ohos` - `x86_64-unknown-linux-ohos` ### More Information? see MCP: https://github.com/rust-lang/compiler-team/issues/811 ### Blockage to be solved? - [x] Submit an MCP - [x] Submit code of promote ohos targets - [x] Resolve related dependencies （`measureme`） The modified code of the measureme has been merged （see https://github.com/rust-lang/measureme/pull/238）. [done] The new version will was released (https://github.com/rust-lang/measureme/pull/240). [done]
Diffstat (limited to 'compiler/rustc_llvm/build.rs')
| -rw-r--r-- | compiler/rustc_llvm/build.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs index 3d1f3b2cd4d..6692ea73540 100644 --- a/compiler/rustc_llvm/build.rs +++ b/compiler/rustc_llvm/build.rs @@ -241,7 +241,7 @@ fn main() { println!("cargo:rustc-link-lib=kstat"); } - if (target.starts_with("arm") && !target.contains("freebsd")) + if (target.starts_with("arm") && !target.contains("freebsd")) && !target.contains("ohos") || target.starts_with("mips-") || target.starts_with("mipsel-") || target.starts_with("powerpc-") @@ -371,6 +371,7 @@ fn main() { || target.contains("freebsd") || target.contains("windows-gnullvm") || target.contains("aix") + || target.contains("ohos") { "c++" } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() { |