This reverts commit b4de632f3f.
This caused the ec2 mozilla builders to fail due to bundling lkgr.json. Reverting til we figure it out.
This commit is contained in:
12
emsdk
12
emsdk
@@ -1527,18 +1527,12 @@ def find_latest_nightly_sdk():
|
||||
else:
|
||||
return find_latest_nightly_32bit_sdk()
|
||||
|
||||
def find_latest_waterfall_sdk(which):
|
||||
def find_latest_upstream_sdk():
|
||||
waterfall_lkgr = load_waterfall_lkgr()
|
||||
if not waterfall_lkgr:
|
||||
print('Failed to find an upstream lkgr')
|
||||
sys.exit(1)
|
||||
return 'sdk-%s-%s-64bit' % (which, waterfall_lkgr[0])
|
||||
|
||||
def find_latest_upstream_sdk():
|
||||
return find_latest_waterfall_sdk('upstream')
|
||||
|
||||
def find_latest_fastcomp_sdk():
|
||||
return find_latest_waterfall_sdk('fastcomp')
|
||||
return 'sdk-upstream-%s-64bit' % waterfall_lkgr[0]
|
||||
|
||||
# Finds the best-matching python tool for use.
|
||||
def find_used_python():
|
||||
@@ -2231,8 +2225,6 @@ def main():
|
||||
sys.argv[i] = str(find_latest_nightly_64bit_sdk())
|
||||
elif sys.argv[i] == 'latest-upstream' or sys.argv[i] == 'latest-clang-upstream':
|
||||
sys.argv[i] = str(find_latest_upstream_sdk())
|
||||
elif sys.argv[i] == 'latest-fastcomp':
|
||||
sys.argv[i] = str(find_latest_fastcomp_sdk())
|
||||
|
||||
if cmd == 'list':
|
||||
print('')
|
||||
|
||||
Reference in New Issue
Block a user