File tree Expand file tree Collapse file tree 5 files changed +11
-15
lines changed Expand file tree Collapse file tree 5 files changed +11
-15
lines changed Original file line number Diff line number Diff line change @@ -456,7 +456,9 @@ set(LIBCXX_COMPILE_FLAGS "")
456
456
set (LIBCXX_LINK_FLAGS "" )
457
457
set (LIBCXX_LIBRARIES "" )
458
458
set (LIBCXX_ADDITIONAL_COMPILE_FLAGS "" CACHE STRING
459
- "Additional Compile only flags which can be provided in cache" )
459
+ "Additional compile flags to use when building libc++. This should be a CMake ;-delimited list of individual
460
+ compiler options to use. For options that must be passed as-is to the compiler without deduplication (e.g.
461
+ `-Xclang -foo` option groups), consider using `SHELL:` (https://cmake.org/cmake/help/latest/command/add_compile_options.html#option-de-duplication)." )
460
462
set (LIBCXX_ADDITIONAL_LIBRARIES "" CACHE STRING
461
463
"Additional libraries libc++ is linked to which can be provided in cache" )
462
464
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ set(LIBCXXABI_USE_LLVM_UNWINDER OFF CACHE BOOL "")
29
29
30
30
# Necessary compile flags for AMDGPU.
31
31
set (LIBCXX_ADDITIONAL_COMPILE_FLAGS
32
- "-nogpulib;-flto;-fconvergent-functions;-Xclang; -mcode-object-version=none" CACHE STRING "" )
32
+ "-nogpulib;-flto;-fconvergent-functions;SHELL: -Xclang -mcode-object-version=none" CACHE STRING "" )
33
33
set (LIBCXXABI_ADDITIONAL_COMPILE_FLAGS
34
- "-nogpulib;-flto;-fconvergent-functions;-Xclang; -mcode-object-version=none" CACHE STRING "" )
34
+ "-nogpulib;-flto;-fconvergent-functions;SHELL: -Xclang -mcode-object-version=none" CACHE STRING "" )
35
35
set (CMAKE_REQUIRED_FLAGS "-nogpulib" CACHE STRING "" )
Original file line number Diff line number Diff line change @@ -213,11 +213,13 @@ General purpose options
213
213
214
214
Output name for the shared libc++ runtime library.
215
215
216
- .. option :: LIBCXX_ADDITIONAL_COMPILE_FLAGS :STRING
216
+ .. option :: {LIBCXX , LIBCXXABI , LIBUNWIND}_ADDITIONAL_COMPILE_FLAGS :STRING
217
217
218
218
**Default **: ``"" ``
219
219
220
- Additional Compile only flags which can be provided in cache.
220
+ Additional compile flags to use when building the runtimes. This should be a CMake ``; ``-delimited list of individual
221
+ compiler options to use. For options that must be passed as-is to the compiler without deduplication (e.g.
222
+ ``-Xclang -foo `` option groups), consider using ``SHELL: `` as `documented here <https://cmake.org/cmake/help/latest/command/add_compile_options.html#option-de-duplication >`_.
221
223
222
224
.. option :: LIBCXX_ADDITIONAL_LIBRARIES:STRING
223
225
@@ -346,12 +348,6 @@ The following options allow building libc++ for a different ABI version.
346
348
Build and use the LLVM unwinder. Note: This option can only be used when
347
349
libc++abi is the C++ ABI library used.
348
350
349
- .. option :: LIBCXXABI_ADDITIONAL_COMPILE_FLAGS:STRING
350
-
351
- **Default **: ``"" ``
352
-
353
- Additional Compile only flags which can be provided in cache.
354
-
355
351
.. option :: LIBCXXABI_ADDITIONAL_LIBRARIES:STRING
356
352
357
353
**Default **: ``"" ``
Original file line number Diff line number Diff line change @@ -222,8 +222,7 @@ set(LIBCXXABI_CXX_FLAGS "")
222
222
set (LIBCXXABI_COMPILE_FLAGS "" )
223
223
set (LIBCXXABI_LINK_FLAGS "" )
224
224
set (LIBCXXABI_LIBRARIES "" )
225
- set (LIBCXXABI_ADDITIONAL_COMPILE_FLAGS "" CACHE STRING
226
- "Additional Compile only flags which can be provided in cache" )
225
+ set (LIBCXXABI_ADDITIONAL_COMPILE_FLAGS "" CACHE STRING "See documentation LIBCXX_ADDITIONAL_COMPILE_FLAGS" )
227
226
set (LIBCXXABI_ADDITIONAL_LIBRARIES "" CACHE STRING
228
227
"Additional libraries libc++abi is linked to which can be provided in cache" )
229
228
Original file line number Diff line number Diff line change @@ -162,8 +162,7 @@ set(LIBUNWIND_C_FLAGS "")
162
162
set (LIBUNWIND_CXX_FLAGS "" )
163
163
set (LIBUNWIND_COMPILE_FLAGS "" )
164
164
set (LIBUNWIND_LINK_FLAGS "" )
165
- set (LIBUNWIND_ADDITIONAL_COMPILE_FLAGS "" CACHE STRING
166
- "Additional Compile only flags which can be provided in cache" )
165
+ set (LIBUNWIND_ADDITIONAL_COMPILE_FLAGS "" CACHE STRING "See documentation for LIBCXX_ADDITIONAL_COMPILE_FLAGS" )
167
166
set (LIBUNWIND_ADDITIONAL_LIBRARIES "" CACHE STRING
168
167
"Additional libraries libunwind is linked to which can be provided in cache" )
169
168
You can’t perform that action at this time.
0 commit comments