diff options
| author | Daniel Wirtz <dcode@dcode.io> | 2019-12-04 02:29:49 +0100 |
|---|---|---|
| committer | Alon Zakai <azakai@google.com> | 2019-12-03 17:29:49 -0800 |
| commit | 9cbe295d20dd8bf625e16f26953cb19d35c6daee (patch) | |
| tree | bc7b1c34699fe81f1598f356793c547b34362cf6 /CMakeLists.txt | |
| parent | b7f75aba59123eca79774d096524079f635cadbd (diff) | |
| download | binaryen-9cbe295d20dd8bf625e16f26953cb19d35c6daee.tar.gz binaryen-9cbe295d20dd8bf625e16f26953cb19d35c6daee.tar.bz2 binaryen-9cbe295d20dd8bf625e16f26953cb19d35c6daee.zip | |
Fix error when building wasm-opt.js with latest-fastcomp (#2494)
With #2483 merged, emcc hits the following warning when attempting to compile wasm-opt to JS with Emsdk:latest-fastcomp:
shared:WARNING: for wasm there is no need to set ELIMINATE_DUPLICATE_FUNCTIONS, the binaryen optimizer does it automatically
shared:ERROR: treating warnings as errors (-Werror)
Appears this happens because ELIMINATE_DUPLICATE_FUNCTIONS is set for all targets when using fastcomp, even though only binaryen_js uses WASM=0. So this PR moves it into the binaryen_js target.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 96d23eb59..f2ca759a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,9 +185,7 @@ IF (EMSCRIPTEN) ADD_COMPILE_FLAG("-Wno-almost-asm") # check for fastcomp by the clang version, which is stuck in fastcomp way # back in the past - IF (${CMAKE_CXX_COMPILER_VERSION} STREQUAL "6.0.1") - ADD_LINK_FLAG("-s ELIMINATE_DUPLICATE_FUNCTIONS=1") - ELSE() + IF (NOT ${CMAKE_CXX_COMPILER_VERSION} STREQUAL "6.0.1") # in opt builds, LTO helps so much (>20%) it's worth slow compile times ADD_NONDEBUG_COMPILE_FLAG("-s WASM_OBJECT_FILES=0") ENDIF() @@ -343,6 +341,10 @@ IF (EMSCRIPTEN) # note that SHELL: is needed as otherwise cmake will coalesce -s link flags # in an incorrect way for emscripten TARGET_LINK_LIBRARIES(binaryen_js "-s WASM=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") + ENDIF() TARGET_LINK_LIBRARIES(binaryen_js "-s WASM_ASYNC_COMPILATION=0") TARGET_LINK_LIBRARIES(binaryen_js "-s MODULARIZE_INSTANCE=1") TARGET_LINK_LIBRARIES(binaryen_js "-s NO_FILESYSTEM=0") |