Skip to content

Commit 6706342

Browse files
committed
[libc++] Remove the ability to not install the support headers
Those are part of the library, and shipping them just adds a tiny bit of size to the distribution. This was originally added in b422ecc to make it possible to match the Makefile build, which doesn't exist anymore. The upside is build system simplification.
1 parent 42f1916 commit 6706342

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

libcxx/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ cmake_dependent_option(LIBCXX_INSTALL_STATIC_LIBRARY
159159
cmake_dependent_option(LIBCXX_INSTALL_SHARED_LIBRARY
160160
"Install the shared libc++ library." ON
161161
"LIBCXX_ENABLE_SHARED;LIBCXX_INSTALL_LIBRARY" OFF)
162-
option(LIBCXX_INSTALL_SUPPORT_HEADERS "Install libc++ support headers." ON)
163162
cmake_dependent_option(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY
164163
"Install libc++experimental.a" ON
165164
"LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY;LIBCXX_INSTALL_LIBRARY" OFF)
@@ -390,11 +389,6 @@ if (LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY AND LIBCXX_ENABLE_ABI_LINKER_SC
390389
LIBCXX_ENABLE_ABI_LINKER_SCRIPT")
391390
endif()
392391

393-
if (LIBCXX_HAS_MUSL_LIBC AND NOT LIBCXX_INSTALL_SUPPORT_HEADERS)
394-
message(FATAL_ERROR "LIBCXX_INSTALL_SUPPORT_HEADERS can not be turned off"
395-
"when building for Musl with LIBCXX_HAS_MUSL_LIBC.")
396-
endif()
397-
398392
if (LIBCXX_ABI_FORCE_ITANIUM AND LIBCXX_ABI_FORCE_MICROSOFT)
399393
message(FATAL_ERROR "Only one of LIBCXX_ABI_FORCE_ITANIUM and LIBCXX_ABI_FORCE_MICROSOFT can be specified.")
400394
endif ()

libcxx/include/CMakeLists.txt

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ set(files
22
__bit_reference
33
__bsd_locale_defaults.h
44
__bsd_locale_fallbacks.h
5-
__errc
65
__debug
6+
__errc
77
__functional_03
88
__functional_base
99
__functional_base_03
@@ -144,6 +144,22 @@ set(files
144144
string.h
145145
string_view
146146
strstream
147+
support/android/locale_bionic.h
148+
support/fuchsia/xlocale.h
149+
support/ibm/limits.h
150+
support/ibm/locale_mgmt_aix.h
151+
support/ibm/support.h
152+
support/ibm/xlocale.h
153+
support/musl/xlocale.h
154+
support/newlib/xlocale.h
155+
support/solaris/floatingpoint.h
156+
support/solaris/wchar.h
157+
support/solaris/xlocale.h
158+
support/win32/limits_msvc_win32.h
159+
support/win32/locale_win32.h
160+
support/xlocale/__nop_locale_mgmt.h
161+
support/xlocale/__posix_l_fallback.h
162+
support/xlocale/__strtonum_fallback.h
147163
system_error
148164
tgmath.h
149165
thread
@@ -162,28 +178,6 @@ set(files
162178
wctype.h
163179
)
164180

165-
if(LIBCXX_INSTALL_SUPPORT_HEADERS)
166-
set(files
167-
${files}
168-
support/android/locale_bionic.h
169-
support/fuchsia/xlocale.h
170-
support/ibm/limits.h
171-
support/ibm/locale_mgmt_aix.h
172-
support/ibm/support.h
173-
support/ibm/xlocale.h
174-
support/musl/xlocale.h
175-
support/newlib/xlocale.h
176-
support/solaris/floatingpoint.h
177-
support/solaris/wchar.h
178-
support/solaris/xlocale.h
179-
support/win32/limits_msvc_win32.h
180-
support/win32/locale_win32.h
181-
support/xlocale/__nop_locale_mgmt.h
182-
support/xlocale/__posix_l_fallback.h
183-
support/xlocale/__strtonum_fallback.h
184-
)
185-
endif()
186-
187181
configure_file("__config_site.in"
188182
"${LIBCXX_BINARY_DIR}/__config_site"
189183
@ONLY)

0 commit comments

Comments
 (0)