[libc] Update include directory for libcMPCWrapper target when LIBC_MPC_INSTALL_PATH is set.

[lntue]

No description provided.

[llvmbot]

@llvm/pr-subscribers-libc

Author: None (lntue)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/124810.diff

2 Files Affected:

• (modified) libc/cmake/modules/LLVMLibCCheckMPC.cmake (+2-2)
• (modified) libc/utils/MPCWrapper/CMakeLists.txt (+8)

diff --git a/libc/cmake/modules/LLVMLibCCheckMPC.cmake b/libc/cmake/modules/LLVMLibCCheckMPC.cmake
index 633719b77575cf..6cc9ee2d9a6f61 100644
--- a/libc/cmake/modules/LLVMLibCCheckMPC.cmake
+++ b/libc/cmake/modules/LLVMLibCCheckMPC.cmake
@@ -1,7 +1,7 @@
 if(LIBC_TESTS_CAN_USE_MPFR)
-  set(LLVM_LIBC_MPC_INSTALL_PATH "" CACHE PATH "Path to where MPC is installed (e.g. C:/src/install or ~/src/install)")
+  set(LIBC_MPC_INSTALL_PATH "" CACHE PATH "Path to where MPC is installed (e.g. C:/src/install or ~/src/install)")
 
-  if(LLVM_LIBC_MPC_INSTALL_PATH)
+  if(LIBC_MPC_INSTALL_PATH)
     set(LIBC_TESTS_CAN_USE_MPC TRUE)
   elseif(LIBC_TARGET_OS_IS_GPU OR LLVM_LIBC_FULL_BUILD)
     # In full build mode, the MPC library should be built using our own facilities,
diff --git a/libc/utils/MPCWrapper/CMakeLists.txt b/libc/utils/MPCWrapper/CMakeLists.txt
index 6c12f73109a576..38e635c5539354 100644
--- a/libc/utils/MPCWrapper/CMakeLists.txt
+++ b/libc/utils/MPCWrapper/CMakeLists.txt
@@ -17,6 +17,14 @@ if(LIBC_TESTS_CAN_USE_MPC)
     libc.src.__support.complex_type
     LibcTest.unit
   )
+  if(EXISTS ${LLVM_LIBC_MPFR_INSTALL_PATH})
+    target_include_directories(libcMPCWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/include)
+    target_link_directories(libcMPCWrapper PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/lib)
+  endif()
+  if(EXISTS ${LIBC_MPC_INSTALL_PATH})
+    target_include_directories(libcMPCWrapper PUBLIC ${LIBC_MPC_INSTALL_PATH}/include)
+    target_link_directories(libcMPCWrapper PUBLIC ${LIBC_MPC_INSTALL_PATH}/lib)
+  endif()
   target_include_directories(libcMPCWrapper PUBLIC ${LIBC_SOURCE_DIR})
   target_link_libraries(libcMPCWrapper PUBLIC libcMPCommon LibcFPTestHelpers.unit LibcTest.unit mpc)
 elseif(NOT LIBC_TARGET_OS_IS_GPU AND NOT LLVM_LIBC_FULL_BUILD)

[nickdesaulniers]

Is the idea to support LLVM_ prefixed and non-prefixed LIBC_MPFR_INSTALL_PATH simultaneously for a time?

[lntue]

Yes, I think for LLVM 21, we might provide message / warnings about switching from LLVM_LIBC_* flags to LIBC_* flags, and supporting both, before removing LLVM_LIBC_* flags in LLVM 22?

[nickdesaulniers]

Sounds like a good plan. Do we have a bug on file for that? If not, would you please file one?

[lntue]

I've created #124860 to track that plan.

[Sh0g0-1758]

LGTM