From df34b02e52a7da2268a05f7a95d99af8c0350152 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 26 May 2021 18:13:16 +0200 Subject: [vcpkg] Fix lib uuid handling for x64-mingw-dynamic (#17137) * Link static uuid on MiNGW * Trigger rebuild --- scripts/cmake/vcpkg_configure_make.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 2294bf807..a6cac929b 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -574,6 +574,11 @@ function(vcpkg_configure_make) list(TRANSFORM ALL_LIBS_LIST REPLACE "^(${_lprefix})" "") endif() list(JOIN ALL_LIBS_LIST " ${_lprefix}" ALL_LIBS_STRING) + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + # libtool must be told explicitly that there is no dynamic linkage for uuid. + # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld. + string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" ALL_LIBS_STRING "${ALL_LIBS_STRING}") + endif() if(ALL_LIBS_STRING) set(ALL_LIBS_STRING "${_lprefix}${ALL_LIBS_STRING}") -- cgit v1.2.3