Skip to content

Commit 966f4b3

Browse files
committed
add run-make support for aix
1 parent 096277e commit 966f4b3

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

src/tools/compiletest/src/directive-list.rs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
3535
"ignore-64bit",
3636
"ignore-aarch64",
3737
"ignore-aarch64-unknown-linux-gnu",
38+
"ignore-aix",
3839
"ignore-android",
3940
"ignore-apple",
4041
"ignore-arm",

src/tools/run-make-support/src/external_deps/rustc.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::command::Command;
55
use crate::env::env_var;
66
use crate::path_helpers::cwd;
77
use crate::util::set_host_rpath;
8-
use crate::{is_darwin, is_msvc, is_windows, uname};
8+
use crate::{is_aix, is_darwin, is_msvc, is_windows, uname};
99

1010
/// Construct a new `rustc` invocation. This will automatically set the library
1111
/// search path as `-L cwd()`. Use [`bare_rustc`] to avoid this.
@@ -365,6 +365,9 @@ impl Rustc {
365365
if is_msvc() { None } else { Some("-lstatic:-bundle=stdc++") }
366366
} else if is_darwin() {
367367
Some("-lc++")
368+
} else if is_aix() {
369+
self.cmd.arg("-lc++");
370+
Some("-lc++abi")
368371
} else {
369372
match &uname()[..] {
370373
"FreeBSD" | "SunOS" | "OpenBSD" => None,

src/tools/run-make-support/src/targets.rs

+6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ pub fn is_darwin() -> bool {
2828
target().contains("darwin")
2929
}
3030

31+
/// Check if target uses AIX.
32+
#[must_use]
33+
pub fn is_aix() -> bool {
34+
target().contains("aix")
35+
}
36+
3137
/// Get the target OS on Apple operating systems.
3238
#[must_use]
3339
pub fn apple_os() -> &'static str {

0 commit comments

Comments
 (0)