[libclc] Fix installed symlinks to be relative again #149728
Conversation
Fix the symlink creation logic to use relative paths instead of absolute, in order to ensure that the installed symlinks actually refer to the installed .bc files rather than the ones from the build directory. This was broken in llvm#146833. The change is a bit roundabout but it attempts to preserve the spirit of llvm#146833, that is the ability to use multiple output directories (provided they all resides in `${LIBCLC_OUTPUT_LIBRARY_DIR}` and preserve the same structure in the installed tree). Signed-off-by: Michał Górny <[email protected]>
mgorny
requested review from
MaskRay,
frasercrmck,
sylvestre,
thesamesam and
wenju-he
| foreach( a IN LISTS ARG_ALIASES ) | ||
| if(CMAKE_HOST_UNIX OR LLVM_USE_SYMLINKS) | ||
| cmake_path(RELATIVE_PATH libclc_builtins_lib | ||
| BASE_DIRECTORY ${LIBCLC_OUTPUT_LIBRARY_DIR} |
There was a problem hiding this comment.
It seems libclc_builtins_lib is always located in LIBCLC_OUTPUT_LIBRARY_DIR, so here probably we only need to set LIBCLC_LINK_OR_COPY_SOURCE to be file basename part of libclc_builtins_lib.
There was a problem hiding this comment.
Sure, but that's precisely what #146833 changed, apparently to account for the possibility of moving the files in the future.
There was a problem hiding this comment.
+@frasercrmck to confirm
There was a problem hiding this comment.
Perhaps best leave it as you've got it here, as it's more robust to changes. If (some) files are moved in the future, everything would likely still be relative to LIBCLC_OUTPUT_LIBRARY_DIR which is the thing that would most likely change. But I don't see the harm in having it as is.
|
Thanks! |
Fix the symlink creation logic to use relative paths instead of absolute, in order to ensure that the installed symlinks actually refer to the installed .bc files rather than the ones from the build directory. This was broken in llvm#146833. The change is a bit roundabout but it attempts to preserve the spirit of llvm#146833, that is the ability to use multiple output directories (provided they all resides in `${LIBCLC_OUTPUT_LIBRARY_DIR}` and preserve the same structure in the installed tree). Signed-off-by: Michał Górny <[email protected]>
|
We need this cherry-picked to |
|
The original change should be revert on 21.x already. |
indeed, I needed to be on rc2 for getting all the reverts. |
6 participants
Fix the symlink creation logic to use relative paths instead of absolute, in order to ensure that the installed symlinks actually refer to the installed .bc files rather than the ones from the build directory. This was broken in #146833. The change is a bit roundabout but it attempts to preserve the spirit of #146833, that is the ability to use multiple output directories (provided they all resides in
${LIBCLC_OUTPUT_LIBRARY_DIR}and preserve the same structure in the installed tree).