From d3de6fe4409a1b39bd50b83cb0eb69b86409a3fc Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 11 Feb 2016 18:48:10 -0800
Subject: [PATCH] Add auto builders for rustbuild build system

Don't gate on them just yet as we need to make sure they actually work.
---
 master/master.cfg | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/master/master.cfg b/master/master.cfg
index a5dc39b..165d7e0 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -113,6 +113,7 @@ auto_platforms = [
     #"mac-64-opt-vg",
     #"mac-all-opt",
     "mac-ios-opt",
+    "mac-64-opt-rustbuild",
 
     "linux-32-opt",
     #"linux-32-nopt-c",
@@ -123,6 +124,7 @@ auto_platforms = [
     "linux-64-debug-opt",
     "linux-musl-64-opt",
     "linux-cross-opt",
+    "linux-64-opt-rustbuild",
 
     #"linux-64-opt-vg",
     #"linux-all-opt",
@@ -138,6 +140,9 @@ auto_platforms = [
     "win-msvc-32-opt",
     "win-msvc-64-opt",
 
+    "win-gnu-32-opt-rustbuild",
+    "win-msvc-64-opt-rustbuild",
+
     # Tier 2 platforms, also modify nogate_builders
     "bitrig-64-opt",
     "freebsd10_32-1",
@@ -183,6 +188,10 @@ nogate_builders = [
     "auto-freebsd10_64-1",
     "auto-dragonflybsd-64-opt",
     "auto-openbsd-64-opt",
+    "auto-mac-64-opt-rustbuild",
+    "auto-linux-64-opt-rustbuild",
+    "auto-win-gnu-32-opt-rustbuild",
+    "auto-win-msvc-64-opt-rustbuild",
 ]
 dist_nogate_platforms = [
     "cross-linux",
@@ -759,7 +768,8 @@ class ConfigCommand(object):
               "docs", "optimize", "optimize-tests",
               "optimize-cxx", "optimize-llvm",
               "debug", "pax-flags", "clang",
-              "inject-std-version", "llvm-static-stdcpp"]
+              "inject-std-version", "llvm-static-stdcpp",
+              "rustbuild"]
         if "cargo" in props:
             s = "./configure --local-rust-root=$PWD/rustc"
         else:
@@ -1526,6 +1536,7 @@ for p in auto_platforms:
     opt_tests = True
     debug = False
     chk = True
+    rustbuild = False
 
     if "-debug" in p:
         debug = True
@@ -1559,6 +1570,9 @@ for p in auto_platforms:
         targets += ios_targets
     if not opt_compiler:
         chk = False
+    if "rustbuild" in p:
+        rustbuild = True
+        chk = False
 
     android = False
     if "-x-android" in p:
@@ -1587,7 +1601,8 @@ for p in auto_platforms:
                         "hosts": auto_platform_host(p),
                         "targets": targets,
                         "debug": debug,
-                        "check": chk},
+                        "check": chk,
+                        "rustbuild": rustbuild},
             factory=make_and_check_buildfactory(chk, android,
                                                 "win" in p, True)))