diff --git a/konan/konan.properties b/konan/konan.properties index a9407ee54e7..4ca4c86a5be 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -312,13 +312,16 @@ targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0. quadruple.mingw_x64 = x86_64-w64-mingw32 targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 libffiDir.mingw_x64 = libffi-3.2.1-mingw-w64-x86-64 -llvmLtoFlags.mingw_x64 = +# For using with Universal Windows Platform (UWP) we need to use this slower option. +# See https://youtrack.jetbrains.com/issue/KT-27654. +# TODO: remove, once fixed in mingw, check with the bug testcase. +llvmLtoFlags.mingw_x64 = -emulated-tls llvmLtoOptFlags.mingw_x64 = -O3 -function-sections llvmLtoNooptFlags.mingw_x64 = -O1 linkerNoDebugFlags.mingw_x64 = -Wl,-S linkerDynamicFlags.mingw_x64 = -shared linkerKonanFlags.mingw_x64 =-static-libgcc -static-libstdc++ \ - -Xclang -flto-visibility-public-std \ + -Xclang -flto-visibility-public-std -Wl,--dynamicbase \ -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \ -Wl,--defsym,__cxa_demangle=Konan_cxa_demangle linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections