Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit 4038446

Browse files
committed
Merge pull request #61 from alexcrichton/rustbuild
Add auto builders for rustbuild build system
2 parents eccf4fb + d3de6fe commit 4038446

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

master/master.cfg

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ auto_platforms = [
113113
#"mac-64-opt-vg",
114114
#"mac-all-opt",
115115
"mac-ios-opt",
116+
"mac-64-opt-rustbuild",
116117

117118
"linux-32-opt",
118119
#"linux-32-nopt-c",
@@ -123,6 +124,7 @@ auto_platforms = [
123124
"linux-64-debug-opt",
124125
"linux-musl-64-opt",
125126
"linux-cross-opt",
127+
"linux-64-opt-rustbuild",
126128

127129
#"linux-64-opt-vg",
128130
#"linux-all-opt",
@@ -138,6 +140,9 @@ auto_platforms = [
138140
"win-msvc-32-opt",
139141
"win-msvc-64-opt",
140142

143+
"win-gnu-32-opt-rustbuild",
144+
"win-msvc-64-opt-rustbuild",
145+
141146
# Tier 2 platforms, also modify nogate_builders
142147
"bitrig-64-opt",
143148
"freebsd10_32-1",
@@ -183,6 +188,10 @@ nogate_builders = [
183188
"auto-freebsd10_64-1",
184189
"auto-dragonflybsd-64-opt",
185190
"auto-openbsd-64-opt",
191+
"auto-mac-64-opt-rustbuild",
192+
"auto-linux-64-opt-rustbuild",
193+
"auto-win-gnu-32-opt-rustbuild",
194+
"auto-win-msvc-64-opt-rustbuild",
186195
]
187196
dist_nogate_platforms = [
188197
"cross-linux",
@@ -759,7 +768,8 @@ class ConfigCommand(object):
759768
"docs", "optimize", "optimize-tests",
760769
"optimize-cxx", "optimize-llvm",
761770
"debug", "pax-flags", "clang",
762-
"inject-std-version", "llvm-static-stdcpp"]
771+
"inject-std-version", "llvm-static-stdcpp",
772+
"rustbuild"]
763773
if "cargo" in props:
764774
s = "./configure --local-rust-root=$PWD/rustc"
765775
else:
@@ -1526,6 +1536,7 @@ for p in auto_platforms:
15261536
opt_tests = True
15271537
debug = False
15281538
chk = True
1539+
rustbuild = False
15291540

15301541
if "-debug" in p:
15311542
debug = True
@@ -1559,6 +1570,9 @@ for p in auto_platforms:
15591570
targets += ios_targets
15601571
if not opt_compiler:
15611572
chk = False
1573+
if "rustbuild" in p:
1574+
rustbuild = True
1575+
chk = False
15621576

15631577
android = False
15641578
if "-x-android" in p:
@@ -1587,7 +1601,8 @@ for p in auto_platforms:
15871601
"hosts": auto_platform_host(p),
15881602
"targets": targets,
15891603
"debug": debug,
1590-
"check": chk},
1604+
"check": chk,
1605+
"rustbuild": rustbuild},
15911606
factory=make_and_check_buildfactory(chk, android,
15921607
"win" in p, True)))
15931608

0 commit comments

Comments
 (0)