[compiler-rt] Make add_custom_libcxx() resilient to DESTDIR being set

arichardson · Groverkss · commit 5ff7f2dd2584 · 2024-11-15T14:15:00.000Z
If DESTDIR is set in the environment during the build/test stage, the local libc++ installation will be installed under DESTDIR instead of being in the build directory. See llvm#115077 (comment) and https://gitlab.kitware.com/cmake/cmake/-/issues/18165. Pull Request: llvm#115525
diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -713,6 +713,9 @@ macro(add_custom_libcxx name prefix)
     USES_TERMINAL_INSTALL 1
     LIST_SEPARATOR |
     EXCLUDE_FROM_ALL TRUE
+    # Ensure that DESTDIR=... set in the out environment does not affect this
+    # target (we always need to install to the build directory).
+    INSTALL_COMMAND env DESTDIR= ${CMAKE_COMMAND} --build ${prefix}/build --target install
     INSTALL_BYPRODUCTS "${prefix}/lib/libc++.a" "${prefix}/lib/libc++abi.a"
     )
 

Original file line number	Diff line number	Diff line change
`@@ -713,6 +713,9 @@ macro(add_custom_libcxx name prefix)`
`713`	`713`	`USES_TERMINAL_INSTALL 1`
`714`	`714`	`LIST_SEPARATOR \|`
`715`	`715`	`EXCLUDE_FROM_ALL TRUE`
	`716`	`+ # Ensure that DESTDIR=... set in the out environment does not affect this`
	`717`	`+ # target (we always need to install to the build directory).`
	`718`	`+ INSTALL_COMMAND env DESTDIR= ${CMAKE_COMMAND} --build ${prefix}/build --target install`
`716`	`719`	`INSTALL_BYPRODUCTS "${prefix}/lib/libc++.a" "${prefix}/lib/libc++abi.a"`
`717`	`720`	`)`
`718`	`721`