From df48648f990480ff50eeba3d1e46df7a8ca0dd8e Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Thu, 10 Jun 2021 23:51:07 +0200 Subject: [PATCH] CMake: Revert to multiple object files for shared druntime As compiling Phobos to a single object file apparently really works already. --- runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 786cb87f1f..355ece1920 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -750,12 +750,12 @@ macro(build_runtime_variant d_flags c_flags ld_flags lib_suffix path_suffix emit endif() # shared druntime/Phobos if(NOT ${BUILD_SHARED_LIBS} STREQUAL "OFF") - # compile druntime with public visibility and extra `version (Shared)` (and preferably to a single object file) + # compile druntime with public visibility and extra `version (Shared)` set(druntime_o "") set(druntime_bc "") compile_druntime("${druntime_d_flags};-relocation-model=pic;-fvisibility=public;-d-version=Shared" "${lib_suffix}${SHARED_LIB_SUFFIX}" "${path_suffix}" - "OFF" "${all_d_files_at_once}" "${all_d_files_at_once}" druntime_o druntime_bc) + "OFF" "${all_d_files_at_once}" "OFF" druntime_o druntime_bc) # compile Phobos with public visibility (and preferably to a single object file) if(phobos2_common STREQUAL "")