[compiler-rt] Make add_custom_libcxx() resilient to DESTDIR being set #115525
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created using spr 1.3.6-beta.1
arichardson
deleted the
users/arichardson/spr/compiler-rt-make-add_custom_libcxx-resilient-to-destdir-being-set
branch
bjope
reviewed
Nov 10, 2024
| @@ -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" | |||
There was a problem hiding this comment.
With the INSTALL_COMMAND fix we now get this:
[2091/2122] Performing install step for 'libcxx_fuzzer_x86_64'
ninja: error: unknown target 'INSTALL_BYPRODUCTS'
FAILED: compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/src/libcxx_fuzzer_x86_64-stamp/libcxx_fuzzer_x86_64-install
cd /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/build && env DESTDIR= /cmake/3.20.1/bin/cmake --build /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/build --target install INSTALL_BYPRODUCTS /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/lib/libc++.a /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/lib/libc++abi.a && /cmake/3.20.1/bin/cmake -E touch /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins/compiler-rt/lib/fuzzer/libcxx_fuzzer_x86_64/src/libcxx_fuzzer_x86_64-stamp/libcxx_fuzzer_x86_64-install
ninja: build stopped: subcommand failed.
FAILED: runtimes/runtimes-x86_64-unknown-linux-gnu-stamps/runtimes-x86_64-unknown-linux-gnu-build
cd /repo/llvm/build-all/runtimes/runtimes-x86_64-unknown-linux-gnu-bins && /cmake/3.20.1/bin/cmake --build .
ninja: build stopped: subcommand failed.
There was a problem hiding this comment.
Ah, maybe the earlier patch that added INSTALL_BYPRODUCTS need to bump the requirement on cmake version to 3.26 (while current requirement is 3.20.0 according to https://llvm.org/docs/GettingStarted.html#software).
There was a problem hiding this comment.
Ah I guess I had a newer CMake, we can make this conditional on CMake version.
There was a problem hiding this comment.
I just built with CMake 3.20 and am able to reproduce - will fix now.
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 #115077 (comment)
and https://gitlab.kitware.com/cmake/cmake/-/issues/18165.