File tree Expand file tree Collapse file tree 3 files changed +35
-4
lines changed Expand file tree Collapse file tree 3 files changed +35
-4
lines changed Original file line number Diff line number Diff line change @@ -9,13 +9,21 @@ RUN cd /root/ \
9
9
&& echo "int main() {}" > hello_world.cpp \
10
10
&& apt-get update \
11
11
&& apt-get install -y python cmake build-essential openjdk-9-jre-headless \
12
+ && /root/emsdk/emsdk update-tags \
13
+ && echo "test latest" \
12
14
&& /root/emsdk/emsdk install latest \
13
15
&& /root/emsdk/emsdk activate latest \
14
16
&& source /root/emsdk/emsdk_env.sh --build=Release \
15
17
&& emcc hello_world.cpp \
16
- && /root/emsdk/emsdk update-tags \
18
+ && echo "test upstream (waterfall)" \
17
19
&& /root/emsdk/emsdk install latest-upstream \
18
20
&& /root/emsdk/emsdk activate latest-upstream \
19
21
&& source /root/emsdk/emsdk_env.sh --build=Release \
20
- && emcc hello_world.cpp -s WASM_OBJECT_FILES=1
22
+ && emcc hello_world.cpp -s WASM_OBJECT_FILES=1 \
23
+ && echo "test fastcomp (waterfall)" \
24
+ && /root/emsdk/emsdk install latest-fastcomp \
25
+ && /root/emsdk/emsdk activate latest-fastcomp \
26
+ && source /root/emsdk/emsdk_env.sh --build=Release \
27
+ && emcc hello_world.cpp \
28
+ && emcc hello_world.cpp -s WASM=0
21
29
Original file line number Diff line number Diff line change @@ -1527,12 +1527,18 @@ def find_latest_nightly_sdk():
1527
1527
else :
1528
1528
return find_latest_nightly_32bit_sdk ()
1529
1529
1530
- def find_latest_upstream_sdk ( ):
1530
+ def find_latest_waterfall_sdk ( which ):
1531
1531
waterfall_lkgr = load_waterfall_lkgr ()
1532
1532
if not waterfall_lkgr :
1533
1533
print ('Failed to find an upstream lkgr' )
1534
1534
sys .exit (1 )
1535
- return 'sdk-upstream-%s-64bit' % waterfall_lkgr [0 ]
1535
+ return 'sdk-%s-%s-64bit' % (which , waterfall_lkgr [0 ])
1536
+
1537
+ def find_latest_upstream_sdk ():
1538
+ return find_latest_waterfall_sdk ('upstream' )
1539
+
1540
+ def find_latest_fastcomp_sdk ():
1541
+ return find_latest_waterfall_sdk ('fastcomp' )
1536
1542
1537
1543
# Finds the best-matching python tool for use.
1538
1544
def find_used_python ():
@@ -2225,6 +2231,8 @@ def main():
2225
2231
sys .argv [i ] = str (find_latest_nightly_64bit_sdk ())
2226
2232
elif sys .argv [i ] == 'latest-upstream' or sys .argv [i ] == 'latest-clang-upstream' :
2227
2233
sys .argv [i ] = str (find_latest_upstream_sdk ())
2234
+ elif sys .argv [i ] == 'latest-fastcomp' :
2235
+ sys .argv [i ] = str (find_latest_fastcomp_sdk ())
2228
2236
2229
2237
if cmd == 'list' :
2230
2238
print ('' )
Original file line number Diff line number Diff line change 199
199
"activated_path" : " %installation_dir%/emscripten" ,
200
200
"activated_cfg" : " LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%'"
201
201
},
202
+ {
203
+ "id" : " waterfall" ,
204
+ "version" : " fastcomp-%waterfall-lkgr%" ,
205
+ "bitness" : 64 ,
206
+ "linux_url" : " https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2" ,
207
+ "install_path" : " fastcomp/%waterfall-lkgr%" ,
208
+ "activated_path" : " %installation_dir%/emscripten" ,
209
+ "activated_cfg" : " LLVM_ROOT='%installation_dir%/fastcomp/bin';BINARYEN_ROOT='%installation_dir%'"
210
+ },
202
211
{
203
212
"id" : " clang" ,
204
213
"version" : " e1.13.0" ,
1549
1558
"uses" : [" waterfall-upstream-%waterfall-lkgr%-64bit" , " node-8.9.1-64bit" ],
1550
1559
"os" : " linux"
1551
1560
},
1561
+ {
1562
+ "version" : " fastcomp-%waterfall-lkgr%" ,
1563
+ "bitness" : 64 ,
1564
+ "uses" : [" waterfall-fastcomp-%waterfall-lkgr%-64bit" , " node-8.9.1-64bit" ],
1565
+ "os" : " linux"
1566
+ },
1552
1567
{
1553
1568
"version" : " %precompiled_tag32%" ,
1554
1569
"bitness" : 32 ,
You can’t perform that action at this time.
0 commit comments