Skip to content

Move WasmFS C++ link workaround from test code to emcc.py #15179

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.

Sign up for GitHub

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
kripken merged 2 commits into from
Sep 29, 2021
Merged

Move WasmFS C++ link workaround from test code to emcc.py #15179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6adf418
Move WASMFS linking hack to emcc.py
kripken Sep 29, 2021
fca158c
Merge remote-tracking branch 'origin/main' into wasmfscxx
kripken Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2330,6 +2330,10 @@ def get_full_import_name(name):

settings.LINK_AS_CXX = (run_via_emxx or settings.DEFAULT_TO_CXX) and '-nostdlib++' not in newargs

# WASMFS itself is written in C++, and needs C++ standard libraries
if settings.WASMFS:
settings.LINK_AS_CXX = True

return target, wasm_target


Expand Down
2 changes: 1 addition & 1 deletion tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ def verify_es5(self, filename):
def build(self, filename, libraries=[], includes=[], force_c=False, js_outfile=True, emcc_args=[], output_basename=None):
suffix = '.js' if js_outfile else '.wasm'
compiler = [compiler_for(filename, force_c)]
if compiler[0] == EMCC and not self.get_setting('WASMFS'):
if compiler[0] == EMCC:
# TODO change test behaviour in the future when WASMFS becomes default file system
# WASMFS is excluded here since it currently requires stdlib++ functions
# TODO(https://github.com/emscripten-core/emscripten/issues/11121)
Expand Down