Skip to content

Commit 7217578

Browse files
authored
Fix midair collision between #13743 and #13733 (#13746)
1 parent 5d9c925 commit 7217578

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

emcc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1587,11 +1587,11 @@ def default_setting(name, new_default):
15871587
default_setting('ERROR_ON_UNDEFINED_SYMBOLS', 0)
15881588
default_setting('WARN_ON_UNDEFINED_SYMBOLS', 0)
15891589

1590-
if 'DISABLE_EXCEPTION_CATCHING' in settings_key_changes and 'EXCEPTION_CATCHING_ALLOWED' in settings_key_changes:
1590+
if 'DISABLE_EXCEPTION_CATCHING' in settings_map and 'EXCEPTION_CATCHING_ALLOWED' in settings_map:
15911591
# If we get here then the user specified both DISABLE_EXCEPTION_CATCHING and EXCEPTION_CATCHING_ALLOWED
15921592
# on the command line. This is no longer valid so report either an error or a warning (for
15931593
# backwards compat with the old `DISABLE_EXCEPTION_CATCHING=2`
1594-
if settings_key_changes['DISABLE_EXCEPTION_CATCHING'] in ('0', '2'):
1594+
if settings_map['DISABLE_EXCEPTION_CATCHING'] in ('0', '2'):
15951595
diagnostics.warning('deprecated', 'DISABLE_EXCEPTION_CATCHING=X is no longer needed when specifying EXCEPTION_CATCHING_ALLOWED')
15961596
else:
15971597
exit_with_error('DISABLE_EXCEPTION_CATCHING and EXCEPTION_CATCHING_ALLOWED are mutually exclusive')

0 commit comments

Comments
 (0)