This is an archive of the discontinued LLVM Phabricator instance.

[CMake][Fuchsia] Merge static libunwind and libc++abi into libc++ on Darwin
ClosedPublic

Authored by phosek on Mar 25 2019, 4:55 PM.

Download Raw Diff

Details

Reviewers

juliehockett
jakehehrlich
EricWF

Commits

rG1b1523c6ff22: [CMake][Fuchsia] Merge static libunwind and libc++abi into libc++ on Darwin
rL356970: [CMake][Fuchsia] Merge static libunwind and libc++abi into libc++ on Darwin
rC356970: [CMake][Fuchsia] Merge static libunwind and libc++abi into libc++ on Darwin

Summary

We want to distribute only a single archive so -lc++ does the right
thing and users don't have to explicitly link -lc++abi and -lunwind.

Diff Detail

Repository: rC Clang

Event Timeline

phosek created this revision.Mar 25 2019, 4:55 PM

Herald added a reviewer: EricWF. · View Herald TranscriptMar 25 2019, 4:55 PM

Herald added a project: Restricted Project. · View Herald Transcript

Herald added subscribers: cfe-commits, mgorny. · View Herald Transcript

juliehockett accepted this revision.Mar 25 2019, 4:56 PM

This revision is now accepted and ready to land.Mar 25 2019, 4:56 PM

Closed by commit rC356970: [CMake][Fuchsia] Merge static libunwind and libc++abi into libc++ on Darwin (authored by phosek). · Explain WhyMar 25 2019, 5:42 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

cmake/

caches/

Fuchsia-stage2.cmake

12 lines

Diff 192229

cmake/caches/Fuchsia-stage2.cmake

	Show All 31 Lines
	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only" CACHE STRING "")			set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only" CACHE STRING "")

	if(APPLE)			if(APPLE)
	list(APPEND BUILTIN_TARGETS "default")			list(APPEND BUILTIN_TARGETS "default")
	list(APPEND RUNTIME_TARGETS "default")			list(APPEND RUNTIME_TARGETS "default")

	set(COMPILER_RT_ENABLE_TVOS OFF CACHE BOOL "")			set(COMPILER_RT_ENABLE_TVOS OFF CACHE BOOL "")
	set(COMPILER_RT_ENABLE_WATCHOS OFF CACHE BOOL "")			set(COMPILER_RT_ENABLE_WATCHOS OFF CACHE BOOL "")

				set(LIBUNWIND_ENABLE_SHARED OFF CACHE BOOL "")
				set(LIBUNWIND_INSTALL_LIBRARY OFF CACHE BOOL "")
				set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")
				set(LIBCXXABI_ENABLE_SHARED OFF CACHE BOOL "")
				set(LIBCXXABI_ENABLE_STATIC_UNWINDER ON CACHE BOOL "")
				set(LIBCXXABI_INSTALL_LIBRARY OFF CACHE BOOL "")
				set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
				set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
				set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
				set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
				set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
	endif()			endif()

	foreach(target aarch64-linux-gnu;armv7-linux-gnueabihf;i386-linux-gnu;x86_64-linux-gnu)			foreach(target aarch64-linux-gnu;armv7-linux-gnueabihf;i386-linux-gnu;x86_64-linux-gnu)
	if(LINUX_${target}_SYSROOT)			if(LINUX_${target}_SYSROOT)
	# Set the per-target builtins options.			# Set the per-target builtins options.
	list(APPEND BUILTIN_TARGETS "${target}")			list(APPEND BUILTIN_TARGETS "${target}")
	set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Linux CACHE STRING "")			set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Linux CACHE STRING "")
	set(BUILTINS_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")			set(BUILTINS_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
	▲ Show 20 Lines • Show All 138 Lines • Show Last 20 Lines