From cadc2d93b6a83f4cdb228dff49b4660fab6b6987 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 6 Sep 2022 10:59:24 -0700 Subject: [PATCH 1/4] Fix build on Emscripten tip of tree --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8077a7c9c0b..924c12e5356 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,6 +411,7 @@ if(EMSCRIPTEN) 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 "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=allocateUTF8OnStack") 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") @@ -447,6 +448,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-sEXPORT_ES6=1") endif() + target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=allocateUTF8OnStack") 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) From f0324c5e9e342d659f79a2c911a1158ddb7e7355 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 6 Sep 2022 11:33:33 -0700 Subject: [PATCH 2/4] fix escaping --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 924c12e5356..c2e8c566cf0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,7 +411,7 @@ if(EMSCRIPTEN) 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 "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=allocateUTF8OnStack") + target_link_libraries(binaryen_wasm "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[$allocateUTF8OnStack]") 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") @@ -448,7 +448,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-sEXPORT_ES6=1") endif() - target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=allocateUTF8OnStack") + target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[$allocateUTF8OnStack]") 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) From fdd3ca0344edfcc311b13b10281fa8f19f5c4355 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 6 Sep 2022 12:15:43 -0700 Subject: [PATCH 3/4] try another escaping method, and remove [] --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c2e8c566cf0..9c0af046a89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,7 +411,7 @@ if(EMSCRIPTEN) 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 "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[$allocateUTF8OnStack]") + target_link_libraries(binaryen_wasm "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$$allocateUTF8OnStack") 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") @@ -448,7 +448,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-sEXPORT_ES6=1") endif() - target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=[$allocateUTF8OnStack]") + target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$$allocateUTF8OnStack") 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) From 9848820d92a1c6d2683b924581d5311a3942d4e2 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 6 Sep 2022 13:03:38 -0700 Subject: [PATCH 4/4] fix? --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c0af046a89..6075f20dde2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,7 +411,7 @@ if(EMSCRIPTEN) 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 "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$$allocateUTF8OnStack") + target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=allocateUTF8OnStack") 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") @@ -448,7 +448,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-sEXPORT_ES6=1") endif() - target_link_libraries(binaryen_js "-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$$allocateUTF8OnStack") + target_link_libraries(binaryen_js "-sEXPORTED_RUNTIME_METHODS=allocateUTF8OnStack") 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)