Merge #16

16: Really install cargo r=ltratt a=vext01





Co-authored-by: Edd Barrett <[email protected]>

Author: bors[bot]

.buildbot.sh

@@ -4,21 +4,26 @@
 
 set -e
 
+export RUST_BACKTRACE=1
+export PATH=PATH=/opt/gdb-8.2/bin:${PATH}
+
+TARBALL_TOPDIR=`pwd`/build/ykrustc-stage2-latest
+TARBALL_NAME=ykrustc-stage2-latest.tar.bz2
+SNAP_DIR=/opt/ykrustc-bin-snapshots
+
 # Ensure the build fails if it uses excessive amounts of memory.
 ulimit -d $((1024 * 1024 * 8)) # 8 GiB
 
 # Note that the gdb must be Python enabled.
-/usr/bin/time -v env PATH=/opt/gdb-8.2/bin:${PATH} \
-    RUST_BACKTRACE=1 ./x.py test --config .buildbot.toml
+/usr/bin/time -v ./x.py test --config .buildbot.toml
 
-# Archive the build and put it in /opt
-TARBALL_TOPDIR=ykrustc-stage2
-TARBALL_NAME=ykrustc-stage2-latest.tar.bz2
-SNAP_DIR=/opt/ykrustc-bin-snapshots
+# Build extended tools and install into TARBALL_TOPDIR.
+mkdir -p ${TARBALL_TOPDIR}
+/usr/bin/time -v ./x.py install --config .buildbot.toml
 
-cd build/x86_64-unknown-linux-gnu
-ln -sf stage2 ${TARBALL_TOPDIR}
+# Archive the build and put it in /opt
 git show -s HEAD > ${TARBALL_TOPDIR}/VERSION
-tar hjcvf ${TARBALL_NAME} ${TARBALL_TOPDIR}
+cd build
+tar jcf ${TARBALL_NAME} `basename ${TARBALL_TOPDIR}`
 chmod 775 ${TARBALL_NAME}
 mv ${TARBALL_NAME} ${SNAP_DIR} # Overwrites any old archive.

.buildbot.toml

@@ -5,8 +5,13 @@ codegen-units = 0           # Use many compilation units.
 debug-assertions = true     # Turn on assertions in rustc.
 
 [build]
+docs = false
 extended = true
-tools = ["cargo", "rustfmt"]
+tools = ["cargo", "rustfmt", "rustdoc"]
 
 [llvm]
 assertions = true           # Turn on assertions in LLVM.
+
+[install]
+prefix = "build/ykrustc-stage2-latest"
+sysconfdir = "etc"