[libcxx-commits] [libcxx] Reapply [libcxx] [modules] Fix relative paths with absolute LIBCXX_INSTALL_MODULES_DIR (PR #86020)

[Martin Storsjö via libcxx-commits]

https://github.com/mstorsjo updated https://github.com/llvm/llvm-project/pull/86020

>From dee8f8aa553c5d7c7ceb7660fab7acd70191c6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
Date: Wed, 20 Mar 2024 23:47:07 +0200
Subject: [PATCH 1/2] Reapply [libcxx] [modules] Fix relative paths with
 absolute LIBCXX_INSTALL_MODULES_DIR

This reapplies 272d1b44efdedb68c194970a610f0ca1b7b769c5
(from #85756), which was reverted in
407937036fa7640f61f225474b1ea6623a40dbdd.

In the previous attempt, empty CMAKE_INSTALL_PREFIX was handled
by quoting them, in d209d1340b99d4fbd325dffb5e13b757ab8264ea.
That made the calls to cmake_path(ABSOLUTE_PATH) succeed, but the
output paths of that weren't actually absolute, which was
required by file(RELATIVE_PATH).

Avoid this issue by appending a slash to CMAKE_INSTALL_PREFIX,
so we always get an absolute path, even if CMAKE_INSTALL_PREFIX
was empty.
---
 libcxx/modules/CMakeLists.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/libcxx/modules/CMakeLists.txt b/libcxx/modules/CMakeLists.txt
index 0dea8cfca94ac3..1d9c7518e9f801 100644
--- a/libcxx/modules/CMakeLists.txt
+++ b/libcxx/modules/CMakeLists.txt
@@ -206,9 +206,18 @@ add_custom_target(generate-cxx-modules
 # Configure the modules manifest.
 # Use the relative path between the installation and the module in the json
 # file. This allows moving the entire installation to a different location.
+#
+# Using a trailing slash in BASE_DIRECTORY, to produce a seemingly valid
+# absolute path, even if CMAKE_INSTALL_PREFIX is empty.
+cmake_path(ABSOLUTE_PATH LIBCXX_INSTALL_LIBRARY_DIR
+  BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/"
+  OUTPUT_VARIABLE ABS_LIBRARY_DIR)
+cmake_path(ABSOLUTE_PATH LIBCXX_INSTALL_MODULES_DIR
+  BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/"
+  OUTPUT_VARIABLE ABS_MODULES_DIR)
 file(RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
-  ${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_LIBRARY_DIR}
-  ${CMAKE_INSTALL_PREFIX}/${LIBCXX_INSTALL_MODULES_DIR})
+  ${ABS_LIBRARY_DIR}
+  ${ABS_MODULES_DIR})
 configure_file(
   "modules.json.in"
   "${LIBCXX_LIBRARY_DIR}/libc++.modules.json"

>From a70cda645a04e6e87284124b21632f6800896250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
Date: Thu, 21 Mar 2024 14:19:11 +0200
Subject: [PATCH 2/2] Set a separate BASE_DIRECTORY variable

---
 libcxx/modules/CMakeLists.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libcxx/modules/CMakeLists.txt b/libcxx/modules/CMakeLists.txt
index 1d9c7518e9f801..d47d19a4755317 100644
--- a/libcxx/modules/CMakeLists.txt
+++ b/libcxx/modules/CMakeLists.txt
@@ -206,14 +206,16 @@ add_custom_target(generate-cxx-modules
 # Configure the modules manifest.
 # Use the relative path between the installation and the module in the json
 # file. This allows moving the entire installation to a different location.
-#
-# Using a trailing slash in BASE_DIRECTORY, to produce a seemingly valid
-# absolute path, even if CMAKE_INSTALL_PREFIX is empty.
+if("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
+  set(BASE_DIRECTORY "/")
+else()
+  set(BASE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+endif()
 cmake_path(ABSOLUTE_PATH LIBCXX_INSTALL_LIBRARY_DIR
-  BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/"
+  BASE_DIRECTORY ${BASE_DIRECTORY}
   OUTPUT_VARIABLE ABS_LIBRARY_DIR)
 cmake_path(ABSOLUTE_PATH LIBCXX_INSTALL_MODULES_DIR
-  BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/"
+  BASE_DIRECTORY ${BASE_DIRECTORY}
   OUTPUT_VARIABLE ABS_MODULES_DIR)
 file(RELATIVE_PATH LIBCXX_MODULE_RELATIVE_PATH
   ${ABS_LIBRARY_DIR}