Skip to content

Ensure compatibility with Safari for multi-environment ES6 builds #18482

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
merged 3 commits into from
Jan 9, 2023
Merged

Ensure compatibility with Safari for multi-environment ES6 builds #18482

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffb8149
Ensure compatibility with Safari for multi-environment ES6 builds
kleisauke Jan 9, 2023
0e54be7
Incorporate review comment
kleisauke Jan 9, 2023
53274f2
Emit a warning when linking with `-sEXPORT_NAME=config`
kleisauke Jan 9, 2023
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
8 changes: 6 additions & 2 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3767,9 +3767,13 @@ def modularize():
if not settings.EXPORT_READY_PROMISE:
return_value = '{}'

# TODO: Remove when https://bugs.webkit.org/show_bug.cgi?id=223533 is resolved.
if async_emit != '' and settings.EXPORT_NAME == 'config':
diagnostics.warning('emcc', 'EXPORT_NAME should not be named "config" when targeting Safari')

src = '''
%(maybe_async)sfunction(%(EXPORT_NAME)s) {
%(EXPORT_NAME)s = %(EXPORT_NAME)s || {};
%(maybe_async)sfunction(config) {
var %(EXPORT_NAME)s = config || {};

%(src)s

Expand Down