Commit 9a7f05378f4497d1ebe1ee6f5ca17390121665a9 | zig

author	Timothee Cour <timothee.cour2@gmail.com> 2020-04-17 17:22:00-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-07-03 04:40:25+00:00
log	9a7f05378f4497d1ebe1ee6f5ca17390121665a9
tree	8ac2087c771fa23eaba6d920126780be2ad4915c
parent	70cc1751ca69dd77625c703445713d067215b5d9

fix https://github.com/ziglang/zig/issues/4799

2 files changed, 10 insertions(+), 1 deletions(-)

CMakeLists.txt
README.md

CMakeLists.txt+7

...	@@ -53,6 +53,7 @@ set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not com	...	@@ -53,6 +53,7 @@ set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not com
53	set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")	53	set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")
54	set(ZIG_ENABLE_MEM_PROFILE off CACHE BOOL "Activate memory usage instrumentation")	54	set(ZIG_ENABLE_MEM_PROFILE off CACHE BOOL "Activate memory usage instrumentation")
55	set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")	55	set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")
		56	set(ZIG_WORKAROUND_4799 off CACHE BOOL "workaround for https://github.com/ziglang/zig/issues/4799")
56	set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")	57	set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")
57		58
58	if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)	59	if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)
...	@@ -88,6 +89,11 @@ if(APPLE AND ZIG_STATIC)	...	@@ -88,6 +89,11 @@ if(APPLE AND ZIG_STATIC)
88	list(APPEND LLVM_LIBRARIES "${ZLIB}")	89	list(APPEND LLVM_LIBRARIES "${ZLIB}")
89	endif()	90	endif()
90		91
		92	if(APPLE AND ZIG_WORKAROUND_4799)
		93	# eg: ${CMAKE_PREFIX_PATH} could be /usr/local/opt/llvm/
		94	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")
		95	endif()
		96
91	set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")	97	set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
92		98
93	# Handle multi-config builds and place each into a common lib. The VS generator	99	# Handle multi-config builds and place each into a common lib. The VS generator
...	@@ -397,6 +403,7 @@ add_library(zig_cpp STATIC ${ZIG_CPP_SOURCES})	...	@@ -397,6 +403,7 @@ add_library(zig_cpp STATIC ${ZIG_CPP_SOURCES})
397	set_target_properties(zig_cpp PROPERTIES	403	set_target_properties(zig_cpp PROPERTIES
398	COMPILE_FLAGS ${EXE_CFLAGS}	404	COMPILE_FLAGS ${EXE_CFLAGS}
399	)	405	)
		406
400	target_link_libraries(zig_cpp LINK_PUBLIC	407	target_link_libraries(zig_cpp LINK_PUBLIC
401	${CLANG_LIBRARIES}	408	${CLANG_LIBRARIES}
402	${LLD_LIBRARIES}	409	${LLD_LIBRARIES}

README.md+3-1

...	@@ -61,11 +61,13 @@ brew outdated llvm \|\| brew upgrade llvm	...	@@ -61,11 +61,13 @@ brew outdated llvm \|\| brew upgrade llvm
61	mkdir build	61	mkdir build
62	cd build	62	cd build
63	cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)	63	cmake .. -DCMAKE_PREFIX_PATH=$(brew --prefix llvm)
64	make install	64	make -j install
65	```	65	```
66		66
67	You will now run into this issue:	67	You will now run into this issue:
68	[homebrew and llvm 10 packages in apt.llvm.org are broken with undefined reference to getPollyPluginInfo](https://github.com/ziglang/zig/issues/4799)	68	[homebrew and llvm 10 packages in apt.llvm.org are broken with undefined reference to getPollyPluginInfo](https://github.com/ziglang/zig/issues/4799)
		69	or this https://github.com/ziglang/zig/issues/5055, in which case try `-DZIG_WORKAROUND_4799=ON`
		70
69		71
70	Please help upstream LLVM and Homebrew solve this issue, there is nothing Zig	72	Please help upstream LLVM and Homebrew solve this issue, there is nothing Zig
71	can do about it. See that issue for a workaround you can do in the meantime.	73	can do about it. See that issue for a workaround you can do in the meantime.