Skip to content

Commit 2ddc56b

Browse files
committed
Addresses review comments and fixes.
1 parent 794742b commit 2ddc56b

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

libcxx/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ set(LIBCXX_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE STRING
428428
"Path where target-agnostic libc++ headers should be installed.")
429429
set(LIBCXX_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING
430430
"Path where built libc++ runtime libraries should be installed.")
431-
set(LIBCXX_INSTALL_MODULE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/../modules/c++/v1" CACHE STRING
431+
set(LIBCXX_INSTALL_MODULE_DIR "usr/share/libc++/v1" CACHE STRING
432432
"Path where target-agnostic libc++ modules should be installed.")
433433

434434
set(LIBCXX_SHARED_OUTPUT_NAME "c++" CACHE STRING "Output name for the shared libc++ runtime library.")

libcxx/modules/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ add_custom_target(generate-cxx-modules
215215
# file. This allows moving the entire installation to a different to a
216216
# different location.
217217
file(RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
218-
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
219-
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULE_DIR})
218+
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
219+
${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULE_DIR})
220220
configure_file(
221221
"modules.json.in"
222-
"${LIBCXX_LIBRARY_DIR}/modules.json"
222+
"${LIBCXX_LIBRARY_DIR}/libc++.modules.json"
223223
@ONLY
224224
)
225225

@@ -248,7 +248,7 @@ if (LIBCXX_INSTALL_MODULES)
248248

249249
# Install the module manifest.
250250
install(FILES
251-
"${LIBCXX_LIBRARY_DIR}/modules.json"
251+
"${LIBCXX_LIBRARY_DIR}/libc++.modules.json"
252252
DESTINATION "${LIBCXX_INSTALL_LIBRARY_DIR}"
253253
COMPONENT cxx-modules
254254
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ

libcxx/modules/modules.json.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"is-standard-library": true,
99
"local-arguments": {
1010
"system-include-directories": [
11-
"@LIBCXX_MODULE_RELATIVE_PATH@/std"
11+
"@LIBCXX_MODULE_RELATIVE_PATH@"
1212
]
1313
}
1414
},
@@ -18,8 +18,7 @@
1818
"is-std-library": true,
1919
"local-arguments": {
2020
"system-include-directories": [
21-
"@LIBCXX_MODULE_RELATIVE_PATH@/std",
22-
"@LIBCXX_MODULE_RELATIVE_PATH@/std.compat"
21+
"@LIBCXX_MODULE_RELATIVE_PATH@"
2322
]
2423
}
2524
}

libcxx/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ if (NOT CMAKE_CONFIGURATION_TYPES)
397397
if(LIBCXX_INSTALL_HEADERS)
398398
set(header_install_target install-cxx-headers)
399399
endif()
400-
if(LIBCXX_INSTALL_MODULES)
400+
if(LIBCXX_INSTALL_MODULES)
401401
set(header_install_target install-cxx-modules)
402402
endif()
403403
add_custom_target(install-cxx

0 commit comments

Comments
 (0)