authorgravatar for git@notcalle.xyzCalle Englund <git@notcalle.xyz> 2020-09-18 16:40:20+02:00
committergravatar for git@notcalle.xyzCalle Englund <git@notcalle.xyz> 2020-09-18 17:03:50+02:00
logd08842887f4c566186ad3babacd9c155233663b3
tree77bd880bc465a2d999aee3f3db13b7f80e35c350
parentfbde15fdf41024d977401ab2a5c52e60b67d48fa
signature Commit is signed but in an unrecognized format.

Workaround MacOS build failure due to #6087

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

CMakeLists.txt+6
...@@ -56,6 +56,7 @@ set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")...@@ -56,6 +56,7 @@ set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")
56set(ZIG_WORKAROUND_4799 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/4799")56set(ZIG_WORKAROUND_4799 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/4799")
57set(ZIG_WORKAROUND_POLLY_SO off CACHE STRING "workaround for https://github.com/ziglang/zig/issues/4799")57set(ZIG_WORKAROUND_POLLY_SO off CACHE STRING "workaround for https://github.com/ziglang/zig/issues/4799")
58set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")58set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")
59set(ZIG_WORKAROUND_6087 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/6087")
5960
60if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)61if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)
61 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")62 SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
...@@ -90,6 +91,11 @@ if(APPLE AND ZIG_STATIC)...@@ -90,6 +91,11 @@ if(APPLE AND ZIG_STATIC)
90 list(APPEND LLVM_LIBRARIES "${ZLIB}")91 list(APPEND LLVM_LIBRARIES "${ZLIB}")
91endif()92endif()
9293
94if(APPLE AND ZIG_WORKAROUND_6087)
95 list(REMOVE_ITEM LLVM_LIBRARIES "-llibxml2.tbd")
96 list(APPEND LLVM_LIBRARIES "-lxml2")
97endif()
98
93if(APPLE AND ZIG_WORKAROUND_4799)99if(APPLE AND ZIG_WORKAROUND_4799)
94 # eg: ${CMAKE_PREFIX_PATH} could be /usr/local/opt/llvm/100 # eg: ${CMAKE_PREFIX_PATH} could be /usr/local/opt/llvm/
95 list(APPEND LLVM_LIBRARIES "-Wl,${CMAKE_PREFIX_PATH}/lib/libPolly.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyPPCG.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyISL.a")101 list(APPEND LLVM_LIBRARIES "-Wl,${CMAKE_PREFIX_PATH}/lib/libPolly.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyPPCG.a" "-Wl,${CMAKE_PREFIX_PATH}/lib/libPollyISL.a")