admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow fastcomp in tot and 2.0.0+ (#584)

Browse Source
This commit is contained in:
Alon Zakai
2020-08-07 09:06:46 -07:00
committed by GitHub
parent 60e3a51c7b
commit 16d4ec5489
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emsdk.py
View File

@@ -2648,7 +2648,8 @@ def expand_sdk_name(name):
elif name == 'tot-upstream': elif name == 'tot-upstream':
return str(find_tot_sdk('upstream')) return str(find_tot_sdk('upstream'))
elif name in ('tot-fastcomp', 'sdk-nightly-latest'): elif name in ('tot-fastcomp', 'sdk-nightly-latest'):
return str(find_tot_sdk('fastcomp')) print('error: The fastcomp compiler is not available tot/nightly builds. Please use the upstream llvm backend or use an older version than 2.0.0.')
sys.exit(1)
else: else:
# check if it's a release handled by an emscripten-releases version, # check if it's a release handled by an emscripten-releases version,
# and if so use that by using the right hash. we support a few notations, # and if so use that by using the right hash. we support a few notations,
@@ -2664,6 +2665,9 @@ def expand_sdk_name(name):
fullname = fullname.replace('-fastcomp', '') fullname = fullname.replace('-fastcomp', '')
backend = 'fastcomp' backend = 'fastcomp'
fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '') fullname = fullname.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
if backend == 'fastcomp' and version_key(fullname) >= (2, 0, 0):
print('error: The fastcomp compiler is not available in 2.0.0+. Please use the upstream llvm backend or use an older version than 2.0.0.')
sys.exit(1)
releases_info = load_releases_info()['releases'] releases_info = load_releases_info()['releases']
release_hash = get_release_hash(fullname, releases_info) release_hash = get_release_hash(fullname, releases_info)
if release_hash: if release_hash:

5
scripts/test.py
View File

@@ -169,11 +169,6 @@ assert old_config == open(emconfig + '.old').read()
# TODO; test on latest as well # TODO; test on latest as well
check_call(upstream_emcc + ' hello_world.c') check_call(upstream_emcc + ' hello_world.c')
print('test tot-fastcomp')
run_emsdk('install tot-fastcomp')
run_emsdk('activate tot-fastcomp')
check_call(fastcomp_emcc + ' hello_world.c')
print('test specific release (old)') print('test specific release (old)')
run_emsdk('install sdk-fastcomp-1.38.31-64bit') run_emsdk('install sdk-fastcomp-1.38.31-64bit')
run_emsdk('activate sdk-fastcomp-1.38.31-64bit') run_emsdk('activate sdk-fastcomp-1.38.31-64bit')