diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-29 21:14:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 21:14:08 +0100 |
| commit | 9436eae49bdafb0ca6e4e4a9fca2adfcaccbb7b4 (patch) | |
| tree | 54945c081f91e1ae151b74b1c0a53cd9d8c7c3b7 /scripts | |
| parent | 6d30a7dd700dfeb76c1ab3ea007147088c2f2f1b (diff) | |
| parent | 69c6aa560cfc1991822fdab1579153f6a25c392f (diff) | |
| download | rust-9436eae49bdafb0ca6e4e4a9fca2adfcaccbb7b4.tar.gz rust-9436eae49bdafb0ca6e4e4a9fca2adfcaccbb7b4.zip | |
Merge pull request #1403 from rust-lang/use_llvm_backend_as_assembler
Support and stabilize inline asm on all platforms
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 4 | ||||
| -rwxr-xr-x | scripts/test_bootstrap.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 3e48fb006de..bbb8a010d96 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -4,7 +4,9 @@ set -e # Compiletest expects all standard library paths to start with /rustc/FAKE_PREFIX. # CG_CLIF_STDLIB_REMAP_PATH_PREFIX will cause cg_clif's build system to pass # --remap-path-prefix to handle this. -CG_CLIF_STDLIB_REMAP_PATH_PREFIX=/rustc/FAKE_PREFIX ./y.sh build +# CG_CLIF_FORCE_GNU_AS will force usage of as instead of the LLVM backend of rustc as we +# the LLVM backend isn't compiled in here. +CG_CLIF_FORCE_GNU_AS=1 CG_CLIF_STDLIB_REMAP_PATH_PREFIX=/rustc/FAKE_PREFIX ./y.sh build echo "[SETUP] Rust fork" git clone https://github.com/rust-lang/rust.git || true diff --git a/scripts/test_bootstrap.sh b/scripts/test_bootstrap.sh index 791d457993d..a8f6d7a2024 100755 --- a/scripts/test_bootstrap.sh +++ b/scripts/test_bootstrap.sh @@ -11,5 +11,7 @@ rm -r compiler/rustc_codegen_cranelift/{Cargo.*,src} cp ../Cargo.* compiler/rustc_codegen_cranelift/ cp -r ../src compiler/rustc_codegen_cranelift/src -./x.py build --stage 1 library/std +# CG_CLIF_FORCE_GNU_AS will force usage of as instead of the LLVM backend of rustc as we +# the LLVM backend isn't compiled in here. +CG_CLIF_FORCE_GNU_AS=1 ./x.py build --stage 1 library/std popd |