Skip to content

Commit b6e20f5

Browse files
committed
some reviews
1 parent ac4f7dd commit b6e20f5

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

lib/Interpreter/CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,10 @@ if(EMSCRIPTEN)
129129
#FIXME: A patch is needed to llvm to remove -Wl,-z,defs since it is now recognised on emscripten. What needs to be removed is here
130130
# https://github.com/llvm/llvm-project/blob/128e2e446e90c3b1827cfc7d4d19e3c0976beff3/llvm/cmake/modules/HandleLLVMOptions.cmake#L318 . The PR to do try to do this is here
131131
# https://github.com/llvm/llvm-project/pull/123396
132-
set_target_properties(clangCppInterOp
133-
PROPERTIES NO_SONAME 1
132+
set_target_properties(clangCppInterOp PROPERTIES
133+
NO_SONAME 1
134+
LINK_FLAGS "-s WASM_BIGINT -s SIDE_MODULE=1 ${SYMBOLS_LIST}"
134135
)
135-
target_link_options(clangCppInterOp
136-
PRIVATE "SHELL: -s WASM_BIGINT"
137-
PRIVATE "SHELL: -s SIDE_MODULE=1"
138-
PRIVATE "SHELL: ${SYMBOLS_LIST}"
139-
)
140-
141136
if (CPPINTEROP_ENABLE_TESTING)
142137
# When compiling Emscripten tests the shared library it links to is expected to be in the same folder as the compiled Javascript
143138
add_custom_command(TARGET clangCppInterOp POST_BUILD

unittests/CppInterOp/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ if(EMSCRIPTEN)
2929
target_link_options(CppInterOpTests
3030
PUBLIC "SHELL: -fexceptions"
3131
PUBLIC "SHELL: -s MAIN_MODULE=1"
32-
PUBLIC "SHELL: -s WASM=1"
3332
PUBLIC "SHELL: -s WASM_BIGINT"
3433
PUBLIC "SHELL: -s ASSERTIONS=0"
3534
PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
36-
PUBLIC "SHELL: -s EXIT_RUNTIME=1"
3735
PUBLIC "SHELL: -s STACK_SIZE=32mb"
3836
PUBLIC "SHELL: -s INITIAL_MEMORY=128mb"
3937
PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"
@@ -75,11 +73,9 @@ if(EMSCRIPTEN)
7573
target_link_options(DynamicLibraryManagerTests
7674
PUBLIC "SHELL: -fexceptions"
7775
PUBLIC "SHELL: -s MAIN_MODULE=1"
78-
PUBLIC "SHELL: -s WASM=1"
7976
PUBLIC "SHELL: -s WASM_BIGINT"
8077
PUBLIC "SHELL: -s ASSERTIONS=0"
8178
PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
82-
PUBLIC "SHELL: -s EXIT_RUNTIME=1"
8379
PUBLIC "SHELL: -s STACK_SIZE=32mb"
8480
PUBLIC "SHELL: -s INITIAL_MEMORY=128mb"
8581
PUBLIC "SHELL: --preload-file ${SYSROOT_PATH}/include@/include"

0 commit comments

Comments
 (0)