diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-12-31 13:29:53 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-12-31 13:29:53 +0000 |
| commit | 0cfbc47b9a32735659f8347872c571bdfeba8424 (patch) | |
| tree | ab7482add7e09f8a5485d5272ee4970c520b78b9 /scripts | |
| parent | 6b1a3ad4a69c5d4374081f9caf362b54bb277dda (diff) | |
| download | rust-0cfbc47b9a32735659f8347872c571bdfeba8424.tar.gz rust-0cfbc47b9a32735659f8347872c571bdfeba8424.zip | |
Merge commit '6d355f6844323db03bfd608899613e363e701951' into sync_cg_clif-2023-12-31
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 731828caae2..684a5d07293 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -# CG_CLIF_FORCE_GNU_AS will force usage of as instead of the LLVM backend of rustc as we +# CG_CLIF_FORCE_GNU_AS will force usage of as instead of the LLVM backend of rustc as # the LLVM backend isn't compiled in here. export CG_CLIF_FORCE_GNU_AS=1 @@ -11,20 +11,19 @@ export 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 --filter=tree:0 || true +git clone --quiet https://github.com/rust-lang/rust.git --filter=tree:0 || true pushd rust git fetch -git checkout -- . -git checkout "$(rustc -V | cut -d' ' -f3 | tr -d '(')" +git checkout --no-progress -- . +git checkout --no-progress "$(rustc -V | cut -d' ' -f3 | tr -d '(')" + +git submodule update --quiet --init src/tools/cargo library/backtrace library/stdarch git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \ am ../patches/*-stdlib-*.patch cat > config.toml <<EOF -change-id = 115898 - -[llvm] -ninja = false +change-id = 999999 [build] rustc = "$(pwd)/../dist/bin/rustc-clif" |