@@ -414,15 +414,16 @@ set(LIBCXX_INSTALL_MODULES_DIR "share/libc++/v1" CACHE STRING
414
414
set (LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library." )
415
415
set (LIBCXX_STATIC_OUTPUT_NAME "c++" CACHE STRING "Output name for the static libc++ runtime library." )
416
416
417
+ set (LIBCXX_GENERATED_INCLUDE_DIR "${LIBCXX_BINARY_DIR} /include/c++/v1" )
418
+ set (LIBCXX_GENERATED_MODULE_DIR "${LIBCXX_BINARY_DIR} /modules/c++/v1" )
419
+
417
420
if (LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE )
418
421
set (LIBCXX_TARGET_SUBDIR ${LLVM_DEFAULT_TARGET_TRIPLE} )
419
422
if (LIBCXX_LIBDIR_SUBDIR )
420
423
string (APPEND LIBCXX_TARGET_SUBDIR /${LIBCXX_LIBDIR_SUBDIR} )
421
424
endif ()
422
425
set (LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR} /${LIBCXX_TARGET_SUBDIR} )
423
- set (LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR} /include/c++/v1" )
424
- set (LIBCXX_GENERATED_MODULE_DIR "${LLVM_BINARY_DIR} /modules/c++/v1" )
425
- set (LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR} /include/${LIBCXX_TARGET_SUBDIR} /c++/v1" )
426
+ set (LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_BINARY_DIR} /include/${LIBCXX_TARGET_SUBDIR} /c++/v1" )
426
427
set (LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LIBCXX_TARGET_SUBDIR} CACHE STRING
427
428
"Path where built libc++ libraries should be installed." )
428
429
set (LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR} /${LIBCXX_TARGET_SUBDIR} /c++/v1" CACHE STRING
@@ -431,12 +432,8 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
431
432
else ()
432
433
if (LLVM_LIBRARY_OUTPUT_INTDIR )
433
434
set (LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR} )
434
- set (LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR} /include/c++/v1" )
435
- set (LIBCXX_GENERATED_MODULE_DIR "${LLVM_BINARY_DIR} /modules/c++/v1" )
436
435
else ()
437
436
set (LIBCXX_LIBRARY_DIR ${CMAKE_BINARY_DIR} /lib${LIBCXX_LIBDIR_SUFFIX} )
438
- set (LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR} /include/c++/v1" )
439
- set (LIBCXX_GENERATED_MODULE_DIR "${CMAKE_BINARY_DIR} /modules/c++/v1" )
440
437
endif ()
441
438
set (LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR} " )
442
439
set (LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE STRING
0 commit comments