[libc] Update include directory for libcMPCommon target when LLVM_LIBC_MPFR_INSTALL_PATH is set.

[lntue]

Fix the current riscv32 bot failures.

[llvmbot]

@llvm/pr-subscribers-libc

Author: None (lntue)

Changes

Fix the current riscv32 bot failures.

---

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

1 Files Affected:

• (modified) libc/utils/MPFRWrapper/CMakeLists.txt (+4)

diff --git a/libc/utils/MPFRWrapper/CMakeLists.txt b/libc/utils/MPFRWrapper/CMakeLists.txt
index 8aeee2463dc51f..f7df9146c8d480 100644
--- a/libc/utils/MPFRWrapper/CMakeLists.txt
+++ b/libc/utils/MPFRWrapper/CMakeLists.txt
@@ -16,6 +16,10 @@ if(LIBC_TESTS_CAN_USE_MPFR OR LIBC_TESTS_CAN_USE_MPC)
     libc.src.__support.FPUtil.cast
     libc.src.__support.FPUtil.fp_bits
   )
+  if(EXISTS ${LLVM_LIBC_MPFR_INSTALL_PATH})
+    target_include_directories(libcMPCommon PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/include)
+    target_link_directories(libcMPCommon PUBLIC ${LLVM_LIBC_MPFR_INSTALL_PATH}/lib)
+  endif()
   target_include_directories(libcMPCommon PUBLIC ${LIBC_SOURCE_DIR})
   target_link_libraries(libcMPCommon PUBLIC LibcFPTestHelpers.unit mpfr gmp)
 elseif(NOT LIBC_TARGET_OS_IS_GPU AND NOT LLVM_LIBC_FULL_BUILD)

[nickdesaulniers]

I thought #124702 was supposed to fix this build bot? I'm all for remove -ffreestanding, but are BOTH necessary to fix this build bot?

[lntue]

I thought #124702 was supposed to fix this build bot? I'm all for remove -ffreestanding, but are BOTH necessary to fix this build bot?

That one fixes other build bots that have libmpfr and libgmp installed in the system directories that they can find. RISCV32 bot installed mpfr at different location, and use LLVM_LIBC_MPFR_INSTALL_PATH to point to that location, so this PR just adds that to the search path of the new target libcMPCommon similar to libcMPFRWrapper target.

[Sh0g0-1758]

@lntue , can you add something similar for MPCWrapper as well ? Perhaps in another PR ?