Revert "Build libbinaryen as a monolithic statically/shared library (#2463)" (#2474)

This reverts commit bf8f36c31c0b8e6213bce840be66937dd6d0f6af.

8 files changed, 8 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc074e094..6e5b0df56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,7 @@ IF(BUILD_STATIC_LIB)
 ELSE()
   ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES})
 ENDIF()
-TARGET_LINK_LIBRARIES(binaryen PRIVATE passes wasm asmjs emscripten-optimizer ir cfg support)
+TARGET_LINK_LIBRARIES(binaryen passes wasm asmjs emscripten-optimizer ir cfg support)
 INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/src/asmjs/CMakeLists.txt b/src/asmjs/CMakeLists.txt
index e9fa3d12f..0252ed911 100644
--- a/src/asmjs/CMakeLists.txt
+++ b/src/asmjs/CMakeLists.txt
@@ -3,4 +3,4 @@ SET(asmjs_SOURCES
   asmangle.cpp
   shared-constants.cpp
 )
-ADD_LIBRARY(asmjs OBJECT ${asmjs_SOURCES})
+ADD_LIBRARY(asmjs STATIC ${asmjs_SOURCES})
\ No newline at end of file
diff --git a/src/cfg/CMakeLists.txt b/src/cfg/CMakeLists.txt
index feb4186af..f0825b454 100644
--- a/src/cfg/CMakeLists.txt
+++ b/src/cfg/CMakeLists.txt
@@ -1,4 +1,4 @@
 SET(cfg_SOURCES
   Relooper.cpp
 )
-ADD_LIBRARY(cfg OBJECT ${cfg_SOURCES})
+ADD_LIBRARY(cfg STATIC ${cfg_SOURCES})
diff --git a/src/emscripten-optimizer/CMakeLists.txt b/src/emscripten-optimizer/CMakeLists.txt
index a2bb7d802..6c302b991 100644
--- a/src/emscripten-optimizer/CMakeLists.txt
+++ b/src/emscripten-optimizer/CMakeLists.txt
@@ -3,4 +3,4 @@ SET(emscripten-optimizer_SOURCES
   parser.cpp
   simple_ast.cpp
 )
-ADD_LIBRARY(emscripten-optimizer OBJECT ${emscripten-optimizer_SOURCES})
+ADD_LIBRARY(emscripten-optimizer STATIC ${emscripten-optimizer_SOURCES})
diff --git a/src/ir/CMakeLists.txt b/src/ir/CMakeLists.txt
index 3f4a77337..e89ece6a2 100644
--- a/src/ir/CMakeLists.txt
+++ b/src/ir/CMakeLists.txt
@@ -4,4 +4,4 @@ SET(ir_SOURCES
   LocalGraph.cpp
   ReFinalize.cpp
 )
-ADD_LIBRARY(ir OBJECT ${ir_SOURCES})
+ADD_LIBRARY(ir STATIC ${ir_SOURCES})
diff --git a/src/passes/CMakeLists.txt b/src/passes/CMakeLists.txt
index 313c0f5a7..d2b7e22bc 100644
--- a/src/passes/CMakeLists.txt
+++ b/src/passes/CMakeLists.txt
@@ -72,4 +72,4 @@ SET(passes_SOURCES
   Vacuum.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/WasmIntrinsics.cpp
 )
-ADD_LIBRARY(passes OBJECT ${passes_SOURCES})
+ADD_LIBRARY(passes STATIC ${passes_SOURCES})
diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index eaf608d58..b3373d076 100644
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -8,5 +8,5 @@ SET(support_SOURCES
   safe_integer.cpp
   threads.cpp
 )
-ADD_LIBRARY(support OBJECT ${support_SOURCES})
+ADD_LIBRARY(support STATIC ${support_SOURCES})
 TARGET_LINK_LIBRARIES(support ${CMAKE_THREAD_LIBS_INIT})
diff --git a/src/wasm/CMakeLists.txt b/src/wasm/CMakeLists.txt
index 984441c6c..f4441953a 100644
--- a/src/wasm/CMakeLists.txt
+++ b/src/wasm/CMakeLists.txt
@@ -10,4 +10,4 @@ SET(wasm_SOURCES
   wasm-type.cpp
   wasm-validator.cpp
 )
-ADD_LIBRARY(wasm OBJECT ${wasm_SOURCES})
+ADD_LIBRARY(wasm STATIC ${wasm_SOURCES})