Cleanup emscripten `-s` flags (#4794)

Avoid space between the `-s` and the option name and add `=` between
option name and value.  This is better, especially for cmake where
some types of flags/options do no preserve order.

1 files changed, 30 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8b755e87..ad0d96bd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,12 +299,12 @@ if(EMSCRIPTEN)
   # link with -O3 for metadce and other powerful optimizations. note that we
   # must use add_link_options so that this appears after CMake's default -O2
   add_link_options("-O3")
-  add_link_flag("-s SINGLE_FILE")
-  add_link_flag("-s ALLOW_MEMORY_GROWTH=1")
-  add_compile_flag("-s DISABLE_EXCEPTION_CATCHING=0")
-  add_link_flag("-s DISABLE_EXCEPTION_CATCHING=0")
+  add_link_flag("-sSINGLE_FILE")
+  add_link_flag("-sALLOW_MEMORY_GROWTH")
+  add_compile_flag("-sDISABLE_EXCEPTION_CATCHING=0")
+  add_link_flag("-sDISABLE_EXCEPTION_CATCHING=0")
   # make the tools immediately usable on Node.js
-  add_link_flag("-s NODERAWFS")
+  add_link_flag("-sNODERAWFS")
   # in opt builds, LTO helps so much (>20%) it's worth slow compile times
   add_nondebug_compile_flag("-flto")
 endif()
@@ -401,17 +401,17 @@ if(EMSCRIPTEN)
   add_executable(binaryen_wasm
                  ${binaryen_emscripten_SOURCES})
   target_link_libraries(binaryen_wasm wasm asmjs emscripten-optimizer passes ir cfg support wasm)
-  target_link_libraries(binaryen_wasm "-s NO_FILESYSTEM=0")
-  target_link_libraries(binaryen_wasm "-s NODERAWFS=0")
-  target_link_libraries(binaryen_wasm "-s EXPORT_NAME=Binaryen")
-  target_link_libraries(binaryen_wasm "-s EXPORT_ES6=1")
+  target_link_libraries(binaryen_wasm "-sFILESYSTEM")
+  target_link_libraries(binaryen_wasm "-sEXPORT_NAME=Binaryen")
+  target_link_libraries(binaryen_wasm "-sNODERAWFS=0")
+  target_link_libraries(binaryen_wasm "-sEXPORT_ES6")
   target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=allocate")
-  target_link_libraries(binaryen_wasm "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js")
-  target_link_libraries(binaryen_wasm "--extern-pre-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-extern-pre.js")
+  target_link_libraries(binaryen_wasm "--post-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js")
+  target_link_libraries(binaryen_wasm "--extern-pre-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-extern-pre.js")
   target_link_libraries(binaryen_wasm "-msign-ext")
   target_link_libraries(binaryen_wasm "-mbulk-memory")
-  target_link_libraries(binaryen_wasm optimized "--closure 1")
-  target_link_libraries(binaryen_wasm optimized "--closure-args \"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT6\"")
+  target_link_libraries(binaryen_wasm optimized "--closure=1")
+  target_link_libraries(binaryen_wasm optimized "--closure-args=\"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT6\"")
   target_link_libraries(binaryen_wasm optimized "-flto")
   target_link_libraries(binaryen_wasm debug "--profiling")
   install(TARGETS binaryen_wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -420,46 +420,46 @@ if(EMSCRIPTEN)
   add_executable(binaryen_js
                  ${binaryen_emscripten_SOURCES})
   target_link_libraries(binaryen_js wasm asmjs emscripten-optimizer passes ir cfg support wasm)
-  target_link_libraries(binaryen_js "-s WASM=0")
-  target_link_libraries(binaryen_js "-s WASM_ASYNC_COMPILATION=0")
+  target_link_libraries(binaryen_js "-sWASM=0")
+  target_link_libraries(binaryen_js "-sWASM_ASYNC_COMPILATION=0")
   if(${CMAKE_CXX_COMPILER_VERSION} STREQUAL "6.0.1")
     # only valid with fastcomp and WASM=0
-    target_link_libraries(binaryen_js "-s ELIMINATE_DUPLICATE_FUNCTIONS=1")
+    target_link_libraries(binaryen_js "-sELIMINATE_DUPLICATE_FUNCTIONS")
   endif()
   # Disabling filesystem and setting web environment for js_of_ocaml
   # so it doesn't try to detect the "node" environment
   if(JS_OF_OCAML)
-    target_link_libraries(binaryen_js "-s NO_FILESYSTEM=1")
-    target_link_libraries(binaryen_js "-s ENVIRONMENT=web,worker")
+    target_link_libraries(binaryen_js "-sFILESYSTEM=0")
+    target_link_libraries(binaryen_js "-sENVIRONMENT=web,worker")
   else()
-    target_link_libraries(binaryen_js "-s NO_FILESYSTEM=0")
+    target_link_libraries(binaryen_js "-sFILESYSTEM=1")
   endif()
-  target_link_libraries(binaryen_js "-s NODERAWFS=0")
-  target_link_libraries(binaryen_js "-s EXPORT_NAME=Binaryen")
+  target_link_libraries(binaryen_js "-sNODERAWFS=0")
+  target_link_libraries(binaryen_js "-sEXPORT_NAME=Binaryen")
   # Currently, js_of_ocaml can only process ES5 code
   if(JS_OF_OCAML)
-    target_link_libraries(binaryen_js "-s EXPORT_ES6=0")
+    target_link_libraries(binaryen_js "-sEXPORT_ES6=0")
   else()
-    target_link_libraries(binaryen_js "-s EXPORT_ES6=1")
+    target_link_libraries(binaryen_js "-sEXPORT_ES6=1")
   endif()
   target_link_libraries(binaryen_js "-sEXPORTED_RUNTIME_METHODS=allocate")
-  target_link_libraries(binaryen_js "--post-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js")
+  target_link_libraries(binaryen_js "--post-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-post.js")
   # js_of_ocaml needs a specified variable with special comment to provide the library to consumers
   if(JS_OF_OCAML)
-    target_link_libraries(binaryen_js "--extern-pre-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.jsoo-extern-pre.js")
+    target_link_libraries(binaryen_js "--extern-pre-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.jsoo-extern-pre.js")
   else()
-    target_link_libraries(binaryen_js "--extern-pre-js ${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-extern-pre.js")
+    target_link_libraries(binaryen_js "--extern-pre-js=${CMAKE_CURRENT_SOURCE_DIR}/src/js/binaryen.js-extern-pre.js")
   endif()
-  target_link_libraries(binaryen_js optimized "--closure 1")
+  target_link_libraries(binaryen_js optimized "--closure=1")
   # Currently, js_of_ocaml can only process ES5 code
   if(JS_OF_OCAML)
-    target_link_libraries(binaryen_js optimized "--closure-args \"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT5\"")
+    target_link_libraries(binaryen_js optimized "--closure-args=\"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT5\"")
   else()
-    target_link_libraries(binaryen_js optimized "--closure-args \"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT6\"")
+    target_link_libraries(binaryen_js optimized "--closure-args=\"--language_in=ECMASCRIPT6 --language_out=ECMASCRIPT6\"")
   endif()
   target_link_libraries(binaryen_js optimized "-flto")
   target_link_libraries(binaryen_js debug "--profiling")
-  target_link_libraries(binaryen_js debug "-s ASSERTIONS")
+  target_link_libraries(binaryen_js debug "-sASSERTIONS")
   install(TARGETS binaryen_js DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()