cmdline: allow overriding -jsD directives (#26576)

Author: subhaushsingh

test/test_jslib.py

@@ -353,8 +353,13 @@ def test_jslib_legacy(self):
   # the -jsDfoo=val syntax:
   # See https://github.com/emscripten-core/emscripten/issues/10580.
   def test_jslib_custom_settings(self):
-    self.cflags += ['--js-library', test_file('jslib/test_jslib_custom_settings.js'), '-jsDCUSTOM_JS_OPTION=1']
-    self.do_run_in_out_file_test('jslib/test_jslib_custom_settings.c')
+    test_file_path = test_file('jslib/test_jslib_custom_settings.c')
+    js_lib = test_file('jslib/test_jslib_custom_settings.js')
+
+    self.do_runf(test_file_path, '1\n', cflags=['--js-library', js_lib, '-jsDCUSTOM_JS_OPTION=1'])
+
+    # verify that the settings can be specified more than once, and that the last one wins.
+    self.do_runf(test_file_path, '2\n', cflags=['--js-library', js_lib, '-jsDCUSTOM_JS_OPTION=1', '-jsDCUSTOM_JS_OPTION=2'])
 
     self.assert_fail([EMCC, '-jsDWASM=0'], 'cannot change built-in settings values with a -jsD directive')
 

tools/cmdline.py

@@ -22,7 +22,7 @@
   shared,
   utils,
 )
-from tools.settings import MEM_SIZE_SETTINGS, settings, user_settings
+from tools.settings import MEM_SIZE_SETTINGS, default_settings, settings, user_settings
 from tools.toolchain_profiler import ToolchainProfiler
 from tools.utils import exit_with_error, read_file
 
@@ -216,6 +216,8 @@ def parse_args(newargs):  # noqa: C901, PLR0912, PLR0915
   """
   should_exit = False
   skip = False
+  builtin_settings = set(default_settings.keys())
+  user_js_defines = set()
   LEGACY_ARGS = {'--js-opts', '--llvm-opts', '--llvm-lto', '--memory-init-file'}
   LEGACY_FLAGS = {'--separate-asm', '--jcache', '--proxy-to-worker', '--default-obj-ext',
                   '--embind-emit-tsd', '--remove-duplicates', '--no-heap-copy'}
@@ -572,11 +574,12 @@ def consume_arg_file():
     elif arg.startswith('-jsD'):
       key = arg.removeprefix('-jsD')
       if '=' in key:
-        key, value = key.split('=')
+        key, value = key.split('=', 1)
       else:
         value = '1'
-      if key in settings.keys():
+      if key in builtin_settings and key not in user_js_defines:
         exit_with_error(f'{arg}: cannot change built-in settings values with a -jsD directive. Pass -s{key}={value} instead!')
+      user_js_defines.add(key)
       # Apply user -jsD settings
       settings[key] = value
       newargs[i] = ''