Merge commit '8f9ac9c22d' into sync_cg_clif-2023-08-09
This commit is contained in:
bjorn3
commit
37751893cc
20 changed files with 194 additions and 110 deletions
|
|
@ -3,6 +3,8 @@ use std::env;
|
|||
use std::os::unix::process::CommandExt;
|
||||
use std::process::Command;
|
||||
|
||||
include!("../build_system/shared_utils.rs");
|
||||
|
||||
fn main() {
|
||||
let current_exe = env::current_exe().unwrap();
|
||||
let mut sysroot = current_exe.parent().unwrap();
|
||||
|
|
@ -10,27 +12,19 @@ fn main() {
|
|||
sysroot = sysroot.parent().unwrap();
|
||||
}
|
||||
|
||||
let mut rustflags = String::new();
|
||||
rustflags.push_str(" -Cpanic=abort -Zpanic-abort-tests -Zcodegen-backend=");
|
||||
let mut rustflags = vec!["-Cpanic=abort".to_owned(), "-Zpanic-abort-tests".to_owned()];
|
||||
if let Some(name) = option_env!("BUILTIN_BACKEND") {
|
||||
rustflags.push_str(name);
|
||||
rustflags.push(format!("-Zcodegen-backend={name}"));
|
||||
} else {
|
||||
rustflags.push_str(
|
||||
sysroot
|
||||
.join(if cfg!(windows) { "bin" } else { "lib" })
|
||||
.join(
|
||||
env::consts::DLL_PREFIX.to_string()
|
||||
+ "rustc_codegen_cranelift"
|
||||
+ env::consts::DLL_SUFFIX,
|
||||
)
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
let dylib = sysroot.join(if cfg!(windows) { "bin" } else { "lib" }).join(
|
||||
env::consts::DLL_PREFIX.to_string()
|
||||
+ "rustc_codegen_cranelift"
|
||||
+ env::consts::DLL_SUFFIX,
|
||||
);
|
||||
rustflags.push(format!("-Zcodegen-backend={}", dylib.to_str().unwrap()));
|
||||
}
|
||||
rustflags.push_str(" --sysroot ");
|
||||
rustflags.push_str(sysroot.to_str().unwrap());
|
||||
env::set_var("RUSTFLAGS", env::var("RUSTFLAGS").unwrap_or(String::new()) + &rustflags);
|
||||
env::set_var("RUSTDOCFLAGS", env::var("RUSTDOCFLAGS").unwrap_or(String::new()) + &rustflags);
|
||||
rustflags.push("--sysroot".to_owned());
|
||||
rustflags.push(sysroot.to_str().unwrap().to_owned());
|
||||
|
||||
let cargo = if let Some(cargo) = option_env!("CARGO") {
|
||||
cargo
|
||||
|
|
@ -49,10 +43,7 @@ fn main() {
|
|||
|
||||
let args: Vec<_> = match args.get(0).map(|arg| &**arg) {
|
||||
Some("jit") => {
|
||||
env::set_var(
|
||||
"RUSTFLAGS",
|
||||
env::var("RUSTFLAGS").unwrap_or(String::new()) + " -Cprefer-dynamic",
|
||||
);
|
||||
rustflags.push("-Cprefer-dynamic".to_owned());
|
||||
args.remove(0);
|
||||
IntoIterator::into_iter(["rustc".to_string()])
|
||||
.chain(args)
|
||||
|
|
@ -64,10 +55,7 @@ fn main() {
|
|||
.collect()
|
||||
}
|
||||
Some("lazy-jit") => {
|
||||
env::set_var(
|
||||
"RUSTFLAGS",
|
||||
env::var("RUSTFLAGS").unwrap_or(String::new()) + " -Cprefer-dynamic",
|
||||
);
|
||||
rustflags.push("-Cprefer-dynamic".to_owned());
|
||||
args.remove(0);
|
||||
IntoIterator::into_iter(["rustc".to_string()])
|
||||
.chain(args)
|
||||
|
|
@ -81,11 +69,28 @@ fn main() {
|
|||
_ => args,
|
||||
};
|
||||
|
||||
let mut cmd = Command::new(cargo);
|
||||
cmd.args(args);
|
||||
rustflags_to_cmd_env(
|
||||
&mut cmd,
|
||||
"RUSTFLAGS",
|
||||
&rustflags_from_env("RUSTFLAGS")
|
||||
.into_iter()
|
||||
.chain(rustflags.iter().map(|flag| flag.clone()))
|
||||
.collect::<Vec<_>>(),
|
||||
);
|
||||
rustflags_to_cmd_env(
|
||||
&mut cmd,
|
||||
"RUSTDOCFLAGS",
|
||||
&rustflags_from_env("RUSTDOCFLAGS")
|
||||
.into_iter()
|
||||
.chain(rustflags.iter().map(|flag| flag.clone()))
|
||||
.collect::<Vec<_>>(),
|
||||
);
|
||||
|
||||
#[cfg(unix)]
|
||||
panic!("Failed to spawn cargo: {}", Command::new(cargo).args(args).exec());
|
||||
panic!("Failed to spawn cargo: {}", cmd.exec());
|
||||
|
||||
#[cfg(not(unix))]
|
||||
std::process::exit(
|
||||
Command::new(cargo).args(args).spawn().unwrap().wait().unwrap().code().unwrap_or(1),
|
||||
);
|
||||
std::process::exit(cmd.spawn().unwrap().wait().unwrap().code().unwrap_or(1));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ rm tests/ui/proc-macro/allowed-signatures.rs
|
|||
# vendor intrinsics
|
||||
rm tests/ui/sse2.rs # cpuid not supported, so sse2 not detected
|
||||
rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
|
||||
rm tests/ui/simd/intrinsic/generic-bswap-byte.rs # simd_bswap not yet implemented
|
||||
rm tests/ui/simd/intrinsic/generic-arithmetic-pass.rs # many missing simd intrinsics
|
||||
|
||||
# exotic linkages
|
||||
rm tests/ui/issues/issue-33992.rs # unsupported linkages
|
||||
|
|
@ -124,6 +126,8 @@ rm tests/ui/typeck/issue-46112.rs # same
|
|||
rm tests/ui/consts/const_cmp_type_id.rs # same
|
||||
rm tests/ui/consts/issue-73976-monomorphic.rs # same
|
||||
rm tests/ui/rfcs/rfc-3348-c-string-literals/non-ascii.rs # same
|
||||
rm tests/ui/consts/const-eval/nonnull_as_ref_ub.rs # same
|
||||
rm tests/ui/consts/issue-94675.rs # same
|
||||
|
||||
# rustdoc-clif passes extra args, suppressing the help message when no args are passed
|
||||
rm -r tests/run-make/issue-88756-default-output
|
||||
|
|
@ -158,8 +162,6 @@ rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
|
|||
|
||||
rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
|
||||
|
||||
rm tests/ui/panic-handler/weak-lang-item-2.rs # Will be fixed by #113568
|
||||
|
||||
cp ../dist/bin/rustdoc-clif ../dist/bin/rustdoc # some tests expect bin/rustdoc to exist
|
||||
|
||||
# prevent $(RUSTDOC) from picking up the sysroot built by x.py. It conflicts with the one used by
|
||||
|
|
@ -172,7 +174,7 @@ index ea06b620c4c..b969d0009c6 100644
|
|||
@@ -9,7 +9,7 @@ RUSTC_ORIGINAL := \$(RUSTC)
|
||||
BARE_RUSTC := \$(HOST_RPATH_ENV) '\$(RUSTC)'
|
||||
BARE_RUSTDOC := \$(HOST_RPATH_ENV) '\$(RUSTDOC)'
|
||||
RUSTC := \$(BARE_RUSTC) --out-dir \$(TMPDIR) -L \$(TMPDIR) \$(RUSTFLAGS)
|
||||
RUSTC := \$(BARE_RUSTC) --out-dir \$(TMPDIR) -L \$(TMPDIR) \$(RUSTFLAGS) -Ainternal_features
|
||||
-RUSTDOC := \$(BARE_RUSTDOC) -L \$(TARGET_RPATH_DIR)
|
||||
+RUSTDOC := \$(BARE_RUSTDOC)
|
||||
ifdef RUSTC_LINKER
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue