diff options
| author | bors <bors@rust-lang.org> | 2022-07-11 06:37:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-11 06:37:20 +0000 |
| commit | 2682b88c526d493edeb2d3f2df358f44db69b73f (patch) | |
| tree | 108cf828c24392caa09bdaa00ecb3c7a91204014 /src/ci | |
| parent | a51fb2ba827f24ec4d676a9575a0a5e46afd302a (diff) | |
| parent | 4151a5b96cb4707bb0b09037bacc58ade1940fa2 (diff) | |
| download | rust-2682b88c526d493edeb2d3f2df358f44db69b73f.tar.gz rust-2682b88c526d493edeb2d3f2df358f44db69b73f.zip | |
Auto merge of #98369 - jyn514:configure.py, r=Mark-Simulacrum
Remove unsupported options in configure.py I've seen people using `optimize = false` and `full-bootstrap = true` in the past, without knowing that they're not recommended. Remove `optimize` and a few other options that are always a bad idea, and document that full-bootstrap is only for testing reproducible builds.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 2 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile index 7651947c525..13d440423b2 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile @@ -35,7 +35,6 @@ ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ --enable-debug \ --enable-lld \ - --enable-optimize \ --set llvm.use-linker=lld \ --set target.x86_64-unknown-linux-gnu.linker=clang \ --set target.x86_64-unknown-linux-gnu.cc=clang \ diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index 65e15950559..3e5dc4af04a 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -33,7 +33,7 @@ if [ ! -d $MUSL ]; then fi cd $MUSL -./configure --enable-optimize --enable-debug --disable-shared --prefix=/musl-$TAG "$@" +./configure --enable-debug --disable-shared --prefix=/musl-$TAG "$@" if [ "$TAG" = "i586" -o "$TAG" = "i686" ]; then hide_output make -j$(nproc) AR=ar RANLIB=ranlib else diff --git a/src/ci/run.sh b/src/ci/run.sh index b0314047c07..16d8bdb8153 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -132,7 +132,7 @@ trap datecheck EXIT SCCACHE_IDLE_TIMEOUT=10800 sccache --start-server || true if [ "$RUN_CHECK_WITH_PARALLEL_QUERIES" != "" ]; then - $SRC/configure --enable-parallel-compiler + $SRC/configure --set rust.parallel-compiler CARGO_INCREMENTAL=0 $PYTHON ../x.py check rm -f config.toml rm -rf build |