diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-29 20:30:50 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-10-29 20:30:50 +0000 |
| commit | 41dcb52153cfb2e3a5eb74af0626e6e984e2ddc4 (patch) | |
| tree | 2824e6157cb20f0a923937c89e792a14e58a8ffa /scripts | |
| parent | da1ed4dc4a3ec8b4952f60f3de161f506418aae3 (diff) | |
| download | rust-41dcb52153cfb2e3a5eb74af0626e6e984e2ddc4.tar.gz rust-41dcb52153cfb2e3a5eb74af0626e6e984e2ddc4.zip | |
Merge commit 'dde58803fd6cbb270c7a437f36a8a3a29fbef679' into sync_cg_clif-2023-10-29
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 |