@@ -587,12 +587,6 @@ set_target_properties(
587
587
# Use a custom .props file to set up Visual D (import paths, predefined versions...).
588
588
VS_USER_PROPS "${PROJECT_SOURCE_DIR} /cmake/VisualD.props"
589
589
)
590
- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
591
- # FreeBSD LLVM port links to zstd, but does not convey this information via CMake
592
- # Workaround it here until it is fixed in the port
593
- find_package (zstd )
594
- list (APPEND LLVM_LIBRARIES "$<TARGET_LINKER_FILE:zstd::libzstd_shared>" )
595
- endif ()
596
590
# LDFLAGS should actually be in target property LINK_FLAGS, but this works, and gets around linking problems
597
591
target_link_libraries (${LDC_LIB} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS} )
598
592
if (WIN32 )
@@ -626,16 +620,21 @@ if(LDC_WITH_LLD)
626
620
else ()
627
621
set (LDC_LINKERFLAG_LIST -lLLVMSymbolize ${LDC_LINKERFLAG_LIST} )
628
622
endif ()
629
- set (LLD_MACHO lldMachO )
630
623
if (MSVC )
631
- list (APPEND LDC_LINKERFLAG_LIST lldMinGW.lib lldCOFF.lib lldELF.lib ${LLD_MACHO} .lib lldWasm.lib lldCommon.lib )
624
+ list (APPEND LDC_LINKERFLAG_LIST lldMinGW.lib lldCOFF.lib lldELF.lib lldMachO .lib lldWasm.lib lldCommon.lib )
632
625
else ()
633
- set (LDC_LINKERFLAG_LIST -llldMinGW -llldCOFF -llldELF -l${LLD_MACHO} -llldWasm -llldCommon ${LDC_LINKERFLAG_LIST} )
626
+ set (LDC_LINKERFLAG_LIST -llldMinGW -llldCOFF -llldELF -llldMachO -llldWasm -llldCommon ${LDC_LINKERFLAG_LIST} )
634
627
endif ()
635
628
if (APPLE )
636
629
# LLD 13.0.0 on Mac needs libxar
637
630
list (APPEND LDC_LINKERFLAG_LIST -lxar )
638
631
endif ()
632
+ if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
633
+ # FreeBSD LLVM port links to zstd, but does not convey this information via CMake
634
+ # Workaround it here until it is fixed in the port
635
+ find_package (zstd )
636
+ list (APPEND LDC_LINKERFLAG_LIST "$<TARGET_LINKER_FILE:zstd::libzstd_shared>" )
637
+ endif ()
639
638
endif ()
640
639
641
640
if (NOT DEFINED LDC_LINK_MANUALLY )
0 commit comments