From 70f4e3d7debec0abe197c12fdd334eeca62e5140 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 08:51:22 -0700 Subject: [PATCH 1/7] fix --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53c511baf0f..049b3cdc694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,6 +405,7 @@ if(EMSCRIPTEN) 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 "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=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 optimized "--closure 1") From 6083855d0ce161767dc1f82dad9954eacd06f954 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 08:54:00 -0700 Subject: [PATCH 2/7] fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 049b3cdc694..38646262554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,7 @@ if(EMSCRIPTEN) 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 "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=allocate") + target_link_libraries(binaryen_wasm "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$ALLOC_STACK") 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 optimized "--closure 1") From f1f4db47a9612349261554b107e2a895ba471cf5 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 08:54:48 -0700 Subject: [PATCH 3/7] fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38646262554..06a6aa9f43e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,7 @@ if(EMSCRIPTEN) 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 "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$ALLOC_STACK") + target_link_libraries(binaryen_wasm "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$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 optimized "--closure 1") From 8f85b52656996105836e69c52e227dcd66320466 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 10:09:28 -0700 Subject: [PATCH 4/7] escape --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06a6aa9f43e..c9e54298c28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,7 @@ if(EMSCRIPTEN) 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 "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$allocate") + target_link_libraries(binaryen_wasm "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=\\$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 optimized "--closure 1") From 999e8c8fdfdaa3c95361cb7d31ae3dca9d78c4bf Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 11:18:03 -0700 Subject: [PATCH 5/7] alternative --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9e54298c28..e5df6f9159f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,7 @@ if(EMSCRIPTEN) 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 "-s DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=\\$allocate") + 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 optimized "--closure 1") From 7812d59181285b75cc3cf03faa3f22d90865f046 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 11:53:24 -0700 Subject: [PATCH 6/7] binaryen.js too --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e5df6f9159f..530b6091c9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,6 +440,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-s EXPORT_ES6=1") endif() + target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=allocate") 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 7806698433c1554614326016ab88f7b65a6d7b99 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Mon, 11 Jul 2022 12:39:27 -0700 Subject: [PATCH 7/7] typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 530b6091c9c..41c7429436a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,7 +440,7 @@ if(EMSCRIPTEN) else() target_link_libraries(binaryen_js "-s EXPORT_ES6=1") endif() - target_link_libraries(binaryen_wasm "-sEXPORTED_RUNTIME_METHODS=allocate") + 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") # js_of_ocaml needs a specified variable with special comment to provide the library to consumers if(JS_OF_OCAML)