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

Add auto builders for rustbuild build system #61

Merged
merged 1 commit into from
Feb 12, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions master/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -1526,6 +1536,7 @@ for p in auto_platforms:
opt_tests = True
debug = False
chk = True
rustbuild = False

if "-debug" in p:
debug = True
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)))

Expand Down