From c28a533eab13e847f9ce9fa702df04bc7cc19e94 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Sat, 2 Dec 2017 18:50:52 +0800
Subject: TestRustcBootstrap - Build 1.20 instaed of 1.19 (matches real stage0)

---
 TestRustcBootstrap.sh | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/TestRustcBootstrap.sh b/TestRustcBootstrap.sh
index 51a5218c..7ed30018 100755
--- a/TestRustcBootstrap.sh
+++ b/TestRustcBootstrap.sh
@@ -11,39 +11,29 @@ export MAKEFLAGS
 echo "=== Building stage0 rustc (with libstd)"
 make -C run_rustc
 
+if [ ! -e rustc-1.20.0-src.tar.gz ]; then
+    wget https://static.rust-lang.org/dist/rustc-1.20.0-src.tar.gz
+fi
+
 #
 # Build rustc using entirely mrustc-built tools
 #
 echo "--- Working in directory ${WORKDIR}"
 echo "=== Building rustc bootstrap mrustc stage0"
 mkdir -p ${WORKDIR}mrustc/
-tar -xf rustc-1.19.0-src.tar.gz -C ${WORKDIR}mrustc/
-# > Patch rustc being built by mrustc, remove a feature stablised in 1.19.0
-(cd ${WORKDIR}mrustc/rustc-1.19.0-src && patch -p0) <<EOF
-+++ src/librustc/lib.rs
---- src/librustc/lib.rs
-@@ -48,1 +48,0 @@
--#![cfg_attr(stage0, feature(loop_break_value))]
-+++ src/librustc_typeck/lib.rs
---- src/librustc_typeck/lib.rs
-@@ -88,1 +88,0 @@
--#![cfg_attr(stage0, feature(loop_break_value))]
-+++ src/librustc_driver/lib.rs
---- src/librustc_driver/lib.rs
-@@ -34,1 +34,0 @@
--#![cfg_attr(stage0, feature(loop_break_value))]
-EOF
-cat - > ${WORKDIR}mrustc/rustc-1.19.0-src/config.toml <<EOF
+tar -xf rustc-1.20.0-src.tar.gz -C ${WORKDIR}mrustc/
+cat - > ${WORKDIR}mrustc/rustc-1.20.0-src/config.toml <<EOF
 [build]
 cargo = "${PREFIX}bin/cargo"
 rustc = "${PREFIX}bin/rustc"
+full-bootstrap = true
 EOF
 echo "--- Running x.py, see ${WORKDIR}mrustc.log for progress"
 (cd ${WORKDIR} && mv mrustc build)
-(cd ${WORKDIR}build/rustc-1.19.0-src/ && ./x.py build) > ${WORKDIR}mrustc.log 2>&1
+(cd ${WORKDIR}build/rustc-1.20.0-src/ && ./x.py build --stage 3) > ${WORKDIR}mrustc.log 2>&1
 (cd ${WORKDIR} && mv build mrustc)
 rm -rf ${WORKDIR}mrustc-output
-cp -r ${WORKDIR}mrustc/rustc-1.19.0-src/build/x86_64-unknown-linux-gnu/stage2 ${WORKDIR}mrustc-output
+cp -r ${WORKDIR}mrustc/rustc-1.20.0-src/build/x86_64-unknown-linux-gnu/stage2 ${WORKDIR}mrustc-output
 tar -czvf ${WORKDIR}mrustc.tar.gz -C ${WORKDIR} mrustc-output
 
 #
@@ -52,15 +42,16 @@ tar -czvf ${WORKDIR}mrustc.tar.gz -C ${WORKDIR} mrustc-output
 #
 echo "=== Building rustc bootstrap downloaded stage0"
 mkdir -p ${WORKDIR}official/
-tar -xf rustc-1.19.0-src.tar.gz -C ${WORKDIR}official/
-cat - > ${WORKDIR}official/rustc-1.19.0-src/config.toml <<EOF
+tar -xf rustc-1.20.0-src.tar.gz -C ${WORKDIR}official/
+cat - > ${WORKDIR}official/rustc-1.20.0-src/config.toml <<EOF
 [build]
 cargo = "${PREFIX}bin/cargo"
+full-bootstrap = true
 EOF
 echo "--- Running x.py, see ${WORKDIR}official.log for progress"
 (cd ${WORKDIR} && mv official build)
-(cd ${WORKDIR}build/rustc-1.19.0-src/ && ./x.py build) > ${WORKDIR}official.log 2>&1
+(cd ${WORKDIR}build/rustc-1.20.0-src/ && ./x.py build --stage 3) > ${WORKDIR}official.log 2>&1
 (cd ${WORKDIR} && mv build official)
 rm -rf ${WORKDIR}official-output
-cp -r ${WORKDIR}official/rustc-1.19.0-src/build/x86_64-unknown-linux-gnu/stage2 ${WORKDIR}official-output
+cp -r ${WORKDIR}official/rustc-1.20.0-src/build/x86_64-unknown-linux-gnu/stage2 ${WORKDIR}official-output
 tar -czvf ${WORKDIR}official.tar.gz -C ${WORKDIR} official-output
-- 
cgit v1.2.3