Skip to content

Commit b39cdf5

Browse files
authored
Rollup merge of rust-lang#155988 - Vastargazing:tests/android-target-env-print-cfg, r=petrochenkov
tests/run-make/print-cfg: add Android target_env case Regression test for rust-lang#90834 rust-lang#77729 + rust-lang#78929 accidentally gave Android targets `target_env="gnu"` through `android_base` inheriting from `linux_gnu_base`. rust-lang#90834 moved it back to plain `linux_base` but didn't add a test, so a future target-spec refactor could bring it back unnoticed. This adds an Android case to `tests/run-make/print-cfg` covering exactly that. r? @petrochenkov
2 parents 96b94a8 + ef93fbb commit b39cdf5

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

tests/run-make/print-cfg/rmake.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ fn main() {
4848
includes: &["unix", "target_abi=\"eabihf\""],
4949
disallow: &["windows"],
5050
});
51+
// Regression test for #90834: Android must not have `target_env="gnu"`.
52+
check(PrintCfg {
53+
target: "i686-linux-android",
54+
includes: &["unix", "target_os=\"android\""],
55+
disallow: &["windows", "target_env=\"gnu\""],
56+
});
5157
}
5258

5359
fn check(PrintCfg { target, includes, disallow }: PrintCfg) {

0 commit comments

Comments
 (0)