From 729807203a4ef162f39656be062dd11a428af8e3 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 15 Aug 2019 14:34:52 -0400 Subject: [PATCH] force static libs for vendored dependencies --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 998da172f..ec90a69f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,11 +199,11 @@ else() "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Writer.cpp" "${CMAKE_SOURCE_DIR}/deps/lld/wasm/WriterUtils.cpp" ) - add_library(embedded_lld_lib ${EMBEDDED_LLD_LIB_SOURCES}) - add_library(embedded_lld_elf ${EMBEDDED_LLD_ELF_SOURCES}) - add_library(embedded_lld_coff ${EMBEDDED_LLD_COFF_SOURCES}) - add_library(embedded_lld_mingw ${EMBEDDED_LLD_MINGW_SOURCES}) - add_library(embedded_lld_wasm ${EMBEDDED_LLD_WASM_SOURCES}) + add_library(embedded_lld_lib STATIC ${EMBEDDED_LLD_LIB_SOURCES}) + add_library(embedded_lld_elf STATIC ${EMBEDDED_LLD_ELF_SOURCES}) + add_library(embedded_lld_coff STATIC ${EMBEDDED_LLD_COFF_SOURCES}) + add_library(embedded_lld_mingw STATIC ${EMBEDDED_LLD_MINGW_SOURCES}) + add_library(embedded_lld_wasm STATIC ${EMBEDDED_LLD_WASM_SOURCES}) if(MSVC) set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -D_CRT_SECURE_NO_WARNINGS /w") else() @@ -400,7 +400,7 @@ set(EMBEDDED_SOFTFLOAT_SOURCES "${CMAKE_SOURCE_DIR}/deps/SoftFloat-3e/source/ui32_to_f128M.c" "${CMAKE_SOURCE_DIR}/deps/SoftFloat-3e/source/ui64_to_f128M.c" ) -add_library(embedded_softfloat ${EMBEDDED_SOFTFLOAT_SOURCES}) +add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES}) if(MSVC) set_target_properties(embedded_softfloat PROPERTIES COMPILE_FLAGS "-std=c99 /w"