This is an archive of the discontinued LLVM Phabricator instance.

[CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option
ClosedPublic

Authored by mstorsjo on Aug 14 2018, 1:32 AM.

Download Raw Diff

Details

Reviewers

phosek
rnk
compnerd
smeenai
hans

Commits

rGdb1dc2ea562e: Merging r339697: --------------------------------------------------------------…
rG3d2e5432ae4e: [CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option
rL339850: Merging r339697:
rCXX339697: [CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option
rL339697: [CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option

Summary

This option should be available if LIBCXX_ENABLE_SHARED is enabled, not LIBCXX_ENABLE_STATIC, since the option is about linking shard libraries.

This fixes a typo from SVN r337814.

Diff Detail

Repository: rL LLVM

Event Timeline

mstorsjo created this revision.Aug 14 2018, 1:32 AM

Herald added subscribers: ldionne, mgorny. · View Herald TranscriptAug 14 2018, 1:32 AM

@hans I think this should be merged to 7.0, if reviewers agree with the change.

In D50691#1198514, @mstorsjo wrote:

@hans I think this should be merged to 7.0, if reviewers agree with the change.

Okay, I'll keep an eye on it.

LGTM

This revision is now accepted and ready to land.Aug 14 2018, 8:22 AM

Closed by commit rL339697: [CMake] Fix the LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY option (authored by mstorsjo). · Explain WhyAug 14 2018, 10:33 AM

This revision was automatically updated to reflect the committed changes.

Herald added subscribers: llvm-commits, christof. · View Herald TranscriptAug 14 2018, 10:33 AM

Merged in r339850.

Revision Contents

Path

Size

libcxx/

trunk/

CMakeLists.txt

2 lines

Diff 160635

libcxx/trunk/CMakeLists.txt

	Show First 20 Lines • Show All 169 Lines • ▼ Show 20 Lines
	option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI library" OFF)			option(LIBCXX_ENABLE_STATIC_ABI_LIBRARY "Statically link the ABI library" OFF)

	cmake_dependent_option(LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY			cmake_dependent_option(LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY
	"Statically link the ABI library to static library" ON			"Statically link the ABI library to static library" ON
	"LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_STATIC" OFF)			"LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_STATIC" OFF)

	cmake_dependent_option(LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY			cmake_dependent_option(LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY
	"Statically link the ABI library to shared library" ON			"Statically link the ABI library to shared library" ON
	"LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_STATIC" OFF)			"LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_ENABLE_SHARED" OFF)

	# Generate and install a linker script inplace of libc++.so. The linker script			# Generate and install a linker script inplace of libc++.so. The linker script
	# will link libc++ to the correct ABI library. This option is on by default			# will link libc++ to the correct ABI library. This option is on by default
	# on UNIX platforms other than Apple unless 'LIBCXX_ENABLE_STATIC_ABI_LIBRARY'			# on UNIX platforms other than Apple unless 'LIBCXX_ENABLE_STATIC_ABI_LIBRARY'
	# is on. This option is also disabled when the ABI library is not specified			# is on. This option is also disabled when the ABI library is not specified
	# or is specified to be "none".			# or is specified to be "none".
	set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE OFF)			set(ENABLE_LINKER_SCRIPT_DEFAULT_VALUE OFF)
	if (LLVM_HAVE_LINK_VERSION_SCRIPT AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY			if (LLVM_HAVE_LINK_VERSION_SCRIPT AND NOT LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY
	▲ Show 20 Lines • Show All 572 Lines • Show Last 20 Lines