diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-11-16 12:31:19 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-07 00:30:23 -0800 |
| commit | 0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5 (patch) | |
| tree | 562faa1f54ff105d8b3e2ad6f64ab1efb5be4648 /src/ci/docker | |
| parent | 02ea82ddb8315249067afb2f800d62b4ca1f7678 (diff) | |
| download | rust-0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5.tar.gz rust-0e272de69f4a9c889e5f1a024a88b3e1f60cb6c5.zip | |
mk: Switch rustbuild to the default build system
This commit switches the default build system for Rust from the makefiles to rustbuild. The rustbuild build system has been in development for almost a year now and has become quite mature over time. This commit is an implementation of the proposal on [internals] which slates deletion of the makefiles on 2016-01-02. [internals]: https://internals.rust-lang.org/t/proposal-for-promoting-rustbuild-to-official-status/4368 This commit also updates various documentation in `README.md`, `CONTRIBUTING.md`, `src/bootstrap/README.md`, and throughout the source code of rustbuild itself. Closes #37858
Diffstat (limited to 'src/ci/docker')
| -rw-r--r-- | src/ci/docker/arm-android/Dockerfile | 6 | ||||
| -rw-r--r-- | src/ci/docker/cross/Dockerfile | 1 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 10 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-freebsd/Dockerfile | 3 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-cargotest/Dockerfile | 4 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-gnu-make/Dockerfile (renamed from src/ci/docker/x86_64-gnu-rustbuild/Dockerfile) | 3 | ||||
| -rw-r--r-- | src/ci/docker/x86_64-musl/Dockerfile | 4 |
8 files changed, 16 insertions, 17 deletions
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile index c5b70c227c4..121c0263cbc 100644 --- a/src/ci/docker/arm-android/Dockerfile +++ b/src/ci/docker/arm-android/Dockerfile @@ -9,7 +9,6 @@ RUN dpkg --add-architecture i386 && \ curl \ ca-certificates \ python2.7 \ - python-minimal \ git \ cmake \ ccache \ @@ -39,8 +38,7 @@ ENV RUST_CONFIGURE_ARGS \ --arm-linux-androideabi-ndk=/android/ndk-arm-9 \ --armv7-linux-androideabi-ndk=/android/ndk-arm-9 \ --i686-linux-android-ndk=/android/ndk-x86-9 \ - --aarch64-linux-android-ndk=/android/ndk-aarch64 \ - --enable-rustbuild -ENV RUST_CHECK_TARGET check-stage2-android + --aarch64-linux-android-ndk=/android/ndk-aarch64 +ENV XPY_CHECK test --target arm-linux-androideabi RUN mkdir /tmp/obj RUN chmod 777 /tmp/obj diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index d8af878a958..b7b23d74c9d 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \ python2.7 \ - python-minimal \ git \ cmake \ ccache \ diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index c5b1d00fb7c..ff5345d3aac 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -19,17 +19,21 @@ ci_dir="`dirname $docker_dir`" src_dir="`dirname $ci_dir`" root_dir="`dirname $src_dir`" -docker build \ +docker \ + build \ --rm \ -t rust-ci \ "`dirname "$script"`/$image" mkdir -p $HOME/.ccache mkdir -p $HOME/.cargo +mkdir -p $root_dir/obj -exec docker run \ +exec docker \ + run \ --volume "$root_dir:/checkout:ro" \ - --workdir /tmp/obj \ + --volume "$root_dir/obj:/checkout/obj" \ + --workdir /checkout/obj \ --env SRC=/checkout \ --env CCACHE_DIR=/ccache \ --volume "$HOME/.ccache:/ccache" \ diff --git a/src/ci/docker/x86_64-freebsd/Dockerfile b/src/ci/docker/x86_64-freebsd/Dockerfile index dc16c39961c..a3a52f9e6ff 100644 --- a/src/ci/docker/x86_64-freebsd/Dockerfile +++ b/src/ci/docker/x86_64-freebsd/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \ python2.7 \ - python-minimal \ git \ cmake \ ccache \ @@ -23,7 +22,7 @@ ENV \ AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-ar \ CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd10-gcc -ENV RUST_CONFIGURE_ARGS --target=x86_64-unknown-freebsd --enable-rustbuild +ENV RUST_CONFIGURE_ARGS --target=x86_64-unknown-freebsd ENV RUST_CHECK_TARGET "" RUN mkdir /tmp/obj RUN chmod 777 /tmp/obj diff --git a/src/ci/docker/x86_64-gnu-cargotest/Dockerfile b/src/ci/docker/x86_64-gnu-cargotest/Dockerfile index 1db01f2b48d..107e2bf8a12 100644 --- a/src/ci/docker/x86_64-gnu-cargotest/Dockerfile +++ b/src/ci/docker/x86_64-gnu-cargotest/Dockerfile @@ -7,14 +7,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \ python2.7 \ - python-minimal \ git \ cmake \ ccache \ libssl-dev \ sudo -ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-rustbuild +ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu ENV RUST_CHECK_TARGET check-cargotest +ENV NO_VENDOR 1 RUN mkdir /tmp/obj RUN chmod 777 /tmp/obj diff --git a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile b/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile index ca06940ae5e..c27e3d1325f 100644 --- a/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile +++ b/src/ci/docker/x86_64-gnu-llvm-3.7/Dockerfile @@ -7,7 +7,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \ python2.7 \ - python2.7-minimal \ git \ cmake \ ccache \ @@ -19,7 +18,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ENV RUST_CONFIGURE_ARGS \ --build=x86_64-unknown-linux-gnu \ - --enable-rustbuild \ --llvm-root=/usr/lib/llvm-3.7 ENV RUST_CHECK_TARGET check RUN mkdir /tmp/obj diff --git a/src/ci/docker/x86_64-gnu-rustbuild/Dockerfile b/src/ci/docker/x86_64-gnu-make/Dockerfile index d4d0492e2a2..93229b2a010 100644 --- a/src/ci/docker/x86_64-gnu-rustbuild/Dockerfile +++ b/src/ci/docker/x86_64-gnu-make/Dockerfile @@ -7,14 +7,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ curl \ ca-certificates \ python2.7 \ - python-minimal \ git \ cmake \ ccache \ sudo \ gdb -ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --enable-rustbuild +ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --disable-rustbuild ENV RUST_CHECK_TARGET check RUN mkdir /tmp/obj RUN chmod 777 /tmp/obj diff --git a/src/ci/docker/x86_64-musl/Dockerfile b/src/ci/docker/x86_64-musl/Dockerfile index 1afaef2e056..967940fb1f3 100644 --- a/src/ci/docker/x86_64-musl/Dockerfile +++ b/src/ci/docker/x86_64-musl/Dockerfile @@ -20,8 +20,10 @@ RUN sh /build/build-musl.sh && rm -rf /build ENV RUST_CONFIGURE_ARGS \ --target=x86_64-unknown-linux-musl \ - --musl-root=/musl-x86_64 + --musl-root-x86_64=/musl-x86_64 ENV RUST_CHECK_TARGET check-stage2-T-x86_64-unknown-linux-musl-H-x86_64-unknown-linux-gnu +ENV PATH=$PATH:/musl-x86_64/bin +ENV XPY_CHECK test --target x86_64-unknown-linux-musl RUN mkdir /tmp/obj RUN chmod 777 /tmp/obj |
