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

Commit 35f2e3a

Browse files
author
Someone on the Dev Buildmaster
committed
Add emscripten targets to new 'rustbuildcross' slaves
1 parent fd4aeb9 commit 35f2e3a

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

master/build-rust-manifest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"aarch64-apple-ios",
7474
"aarch64-linux-android",
7575
"aarch64-unknown-linux-gnu",
76+
"asmjs-unknown-emscripten",
7677
"arm-linux-androideabi",
7778
"arm-unknown-linux-gnueabi",
7879
"arm-unknown-linux-gnueabihf",
@@ -109,6 +110,7 @@
109110
"x86_64-unknown-linux-gnu",
110111
"x86_64-unknown-linux-musl",
111112
"x86_64-unknown-netbsd",
113+
"wasm32-unknown-emscripten",
112114
])
113115

114116
# windows-gnu platforms require an extra bundle of gnu stuff

master/master.cfg

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ auto_platforms = [
127127
"linux-64-debug-opt",
128128
"linux-musl-64-opt",
129129
"linux-cross-opt",
130+
"linux-rustbuildcross-opt",
130131
#"linux-32cross-opt",
131132
"linux-64-opt-rustbuild",
132133

@@ -174,6 +175,7 @@ dist_platforms = ["linux", "mac", "arm-android", "musl-linux",
174175
"cross-linux",
175176
"cross32-linux",
176177
"cross-host-linux",
178+
"rustbuildcross-linux",
177179
"mac-ios",
178180
"win-gnu-32", "win-gnu-64",
179181
"win-msvc-32", "win-msvc-64",
@@ -209,11 +211,13 @@ nogate_builders = [
209211
"auto-freebsd10_64-1",
210212
"auto-dragonflybsd-64-opt",
211213
"auto-openbsd-64-opt",
214+
"auto-linux-rustbuildcross-opt",
212215
]
213216
dist_nogate_platforms = [
214217
#"mac-ios",
215218
#"cross-host-linux",
216219
#"cross-win",
220+
"rustbuildcross-linux",
217221
]
218222

219223
cargo_cross_targets = [
@@ -229,6 +233,7 @@ cargo_cross_targets = [
229233
ios = {'auto': 'cross-ios-opt', 'dist': 'mac-ios'}
230234
lincross = {'auto': 'linux-cross', 'dist': 'cross-linux'}
231235
lincross32 = {'auto': 'linux-32cross', 'dist': 'cross32-linux'}
236+
lincross_rustbuild = {'auto': 'linux-rustbuildcross', 'dist': 'rustbuildcross-linux'}
232237
msvc32 = {'auto': 'msvc-32-cross', 'dist': 'win-msvc-32-cross'}
233238

234239
def xhost(name):
@@ -269,6 +274,8 @@ nightly_cross_targets = beta_cross_targets + [
269274
#{'t': 'arm-unknown-linux-musleabi', 'b': lincross},
270275
#{'t': 'arm-unknown-linux-musleabihf', 'b': lincross},
271276
#{'t': 'armv7-unknown-linux-musleabihf', 'b': lincross},
277+
{'t': 'asmjs-unknown-emscripten', 'b': lincross_rustbuild},
278+
{'t': 'wasm32-unknown-emscripten', 'b': lincross_rustbuild},
272279
]
273280

274281
####### BUILDSLAVES

0 commit comments

Comments
 (0)