Skip to content

Update default emscripten cache directory #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 13, 2020
Merged

Update default emscripten cache directory #501

merged 3 commits into from
May 13, 2020

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented May 12, 2020

Now that emscripten uses an in-tree cache directory there is no
need to copy the pre-built libraries around.

See: WebAssembly/waterfall#644

Also for the sake of older versions of emscripten explictly set
EM_CACHE environment variable to point to the in-tree cache
directory.

@sbc100 sbc100 force-pushed the fix_cache_dir branch 2 times, most recently from 73ee72f to 88586b1 Compare May 13, 2020 01:13
sbc100 added a commit that referenced this pull request May 13, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Split out from #501
sbc100 added a commit that referenced this pull request May 13, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Split out from #501
Now that emscripten uses an in-tree cache directory there is no
need to copy the pre-built libraries around.

See: WebAssembly/waterfall#644

Also for the sake of older versions of emscripten explictly set
EM_CACHE environment variable to point to the in-tree cache
directory.
@sbc100
Copy link
Collaborator Author

sbc100 commented May 13, 2020

This change is more focused now, and its compatible with SDK build both before and after the pre-built libraries were moved.

@sbc100 sbc100 merged commit 14c0a9e into master May 13, 2020
@sbc100 sbc100 deleted the fix_cache_dir branch May 13, 2020 23:28
@@ -158,12 +157,10 @@ def run_emsdk(cmd):

print('test tot-upstream')
run_emsdk('install tot-upstream')
assert not os.path.exists(LIBC)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why can't we check this any more?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I should have explained. This sequence of assert was checking the "activate" re-installs libraries in the cache.

However, in the now model there is no "install into cache step". The cache is just part of the tar archive.. which means if you want to restore the cache after a --clear-cache you need to for a re-install from the tar archive (or just let it get built on demand).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants