authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-08-15 14:34:52-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-08-15 14:34:52-04:00
log729807203a4ef162f39656be062dd11a428af8e3
tree2c95312bf87be139f98b5f0956dd412867652884
parent98183e47436699f6e5eab200061c46eec342806e
signaturelock-open Commit is signed but in an unrecognized format.

force static libs for vendored dependencies


1 files changed, 6 insertions(+), 6 deletions(-)

CMakeLists.txt+6-6
......@@ -199,11 +199,11 @@ else()
199199 "${CMAKE_SOURCE_DIR}/deps/lld/wasm/Writer.cpp"
200200 "${CMAKE_SOURCE_DIR}/deps/lld/wasm/WriterUtils.cpp"
201201 )
202 add_library(embedded_lld_lib ${EMBEDDED_LLD_LIB_SOURCES})
203 add_library(embedded_lld_elf ${EMBEDDED_LLD_ELF_SOURCES})
204 add_library(embedded_lld_coff ${EMBEDDED_LLD_COFF_SOURCES})
205 add_library(embedded_lld_mingw ${EMBEDDED_LLD_MINGW_SOURCES})
206 add_library(embedded_lld_wasm ${EMBEDDED_LLD_WASM_SOURCES})
202 add_library(embedded_lld_lib STATIC ${EMBEDDED_LLD_LIB_SOURCES})
203 add_library(embedded_lld_elf STATIC ${EMBEDDED_LLD_ELF_SOURCES})
204 add_library(embedded_lld_coff STATIC ${EMBEDDED_LLD_COFF_SOURCES})
205 add_library(embedded_lld_mingw STATIC ${EMBEDDED_LLD_MINGW_SOURCES})
206 add_library(embedded_lld_wasm STATIC ${EMBEDDED_LLD_WASM_SOURCES})
207207 if(MSVC)
208208 set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -D_CRT_SECURE_NO_WARNINGS /w")
209209 else()
......@@ -400,7 +400,7 @@ set(EMBEDDED_SOFTFLOAT_SOURCES
400400 "${CMAKE_SOURCE_DIR}/deps/SoftFloat-3e/source/ui32_to_f128M.c"
401401 "${CMAKE_SOURCE_DIR}/deps/SoftFloat-3e/source/ui64_to_f128M.c"
402402)
403add_library(embedded_softfloat ${EMBEDDED_SOFTFLOAT_SOURCES})
403add_library(embedded_softfloat STATIC ${EMBEDDED_SOFTFLOAT_SOURCES})
404404if(MSVC)
405405 set_target_properties(embedded_softfloat PROPERTIES
406406 COMPILE_FLAGS "-std=c99 /w"