提交 48968329 编写于 作者: B bors

Auto merge of #33403 - alexcrichton:consistent-env, r=brson

rustc: Change target_env for ARM targets to `gnu`

Right now they're `gnueabihf` and `gnueabi`, but when adding new platforms like
musl on ARM it's unfortunate to have to test for all three (`musl`, `musleabi`,
and `musleabihf`). This PR switches everything currently to `gnu`, and the new
musl targets can also use `musl` when they land.

Closes #33244
...@@ -19,7 +19,7 @@ pub fn target() -> Target { ...@@ -19,7 +19,7 @@ pub fn target() -> Target {
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
arch: "arm".to_string(), arch: "arm".to_string(),
target_os: "linux".to_string(), target_os: "linux".to_string(),
target_env: "gnueabi".to_string(), target_env: "gnu".to_string(),
target_vendor: "unknown".to_string(), target_vendor: "unknown".to_string(),
options: TargetOptions { options: TargetOptions {
......
...@@ -19,7 +19,7 @@ pub fn target() -> Target { ...@@ -19,7 +19,7 @@ pub fn target() -> Target {
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
arch: "arm".to_string(), arch: "arm".to_string(),
target_os: "linux".to_string(), target_os: "linux".to_string(),
target_env: "gnueabihf".to_string(), target_env: "gnu".to_string(),
target_vendor: "unknown".to_string(), target_vendor: "unknown".to_string(),
options: TargetOptions { options: TargetOptions {
......
...@@ -19,7 +19,7 @@ pub fn target() -> Target { ...@@ -19,7 +19,7 @@ pub fn target() -> Target {
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
arch: "arm".to_string(), arch: "arm".to_string(),
target_os: "linux".to_string(), target_os: "linux".to_string(),
target_env: "gnueabihf".to_string(), target_env: "gnu".to_string(),
target_vendor: "unknown".to_string(), target_vendor: "unknown".to_string(),
options: TargetOptions { options: TargetOptions {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册