This is an archive of the discontinued LLVM Phabricator instance.

[libc++][AIX] Unique the static library names
AbandonedPublic

Authored by daltenty on Oct 11 2022, 10:57 AM.

Download Raw Diff

Details

Reviewers

Summary

in the CMake cache file we use for AIX. As of https://reviews.llvm.org/D135669, we can specify
custom names, which is needed for AIX CMake, as the output names may overlap as static and
shared objects can both be archived. This also stops disabling the static libraries by default, since
we can now safely build them.

Diff Detail

Event Timeline

daltenty created this revision.Oct 11 2022, 10:57 AM

Herald added a project: Restricted Project. · View Herald TranscriptOct 11 2022, 10:57 AM

Add newline to end of file

daltenty edited the summary of this revision. (Show Details)Oct 11 2022, 10:59 AM

ldionne mentioned this in D134221: [runtimes] Always define the cxx_shared, cxx_static & other targets.Oct 11 2022, 12:23 PM

Harbormaster completed remote builds in B191539: Diff 466865.Oct 11 2022, 2:09 PM

These adjustments were added in https://reviews.llvm.org/D134221

Revision Contents

Path

Size

libcxx/

cmake/

caches/

AIX.cmake

13 lines

Diff 466865

libcxx/cmake/caches/AIX.cmake

	set(CMAKE_BUILD_TYPE Release CACHE STRING "")			set(CMAKE_BUILD_TYPE Release CACHE STRING "")
	set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")			set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE BOOL "")
	set(CMAKE_C_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")			set(CMAKE_C_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")
	set(CMAKE_CXX_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")			set(CMAKE_CXX_FLAGS "-D__LIBC_NO_CPP_MATH_OVERLOADS__" CACHE STRING "")
	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-G -Wl,-bcdtors:all:-2147483548:s" CACHE STRING "")			set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-G -Wl,-bcdtors:all:-2147483548:s" CACHE STRING "")
	set(CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "")			set(CMAKE_AR "/usr/bin/ar" CACHE FILEPATH "")

	set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")			set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
	set(LIBCXX_ENABLE_ASSERTIONS OFF CACHE BOOL "")			set(LIBCXX_ENABLE_ASSERTIONS OFF CACHE BOOL "")
	set(LIBCXX_ABI_VERSION "1" CACHE STRING "")			set(LIBCXX_ABI_VERSION "1" CACHE STRING "")
	set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "")
	set(LIBCXX_ENABLE_SHARED ON CACHE BOOL "")
	set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
	set(LIBCXXABI_ENABLE_SHARED ON CACHE BOOL "")
	set(LIBCXXABI_ENABLE_STATIC OFF CACHE BOOL "")			set(LIBCXX_ENABLE_ABI_LINKER_SCRIPT OFF CACHE BOOL "")
	set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")			set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
	set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")			set(LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "")
	set(LIBUNWIND_ENABLE_SHARED ON CACHE BOOL "")
				# Avoid conflicts in the output names, since AIX shared and static libraries
				# are both archived by some CMake versions.
				set(LIBCXX_STATIC_OUTPUT_NAME "c++-static" CACHE STRING "Output name for the static libc++ runtime library.")
				set(LIBCXXABI_STATIC_OUTPUT_NAME "c++abi-static" CACHE STRING "Output name for the static libc++abi runtime library.")
	set(LIBUNWIND_ENABLE_STATIC OFF CACHE BOOL "")			set(LIBUNWIND_STATIC_OUTPUT_NAME "unwind-static" CACHE STRING "Output name for the static libunwind runtime library.")