This is an archive of the discontinued LLVM Phabricator instance.

Differential D130362

Fix one stray `{LLVM -> CLANG}_TOOLS_INSTALL_DIR`
ClosedPublic

Authored by Ericson2314 on Jul 22 2022, 7:27 AM.

Details

Reviewers
tstellar
mstorsjo
Commits
rG32560211c620: Fix one stray `{LLVM -> CLANG}_TOOLS_INSTALL_DIR`
Summary

Follow up to D117977, where I missed this new usage after one rebase.

Thanks @tsteller in https://reviews.llvm.org/D117977#3670919 for
noticing.

Diff Detail

Event Timeline

Ericson2314 created this revision.Jul 22 2022, 7:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 22 2022, 7:27 AM
Herald added a subscriber: mgorny. · View Herald Transcript
Ericson2314 requested review of this revision.Jul 22 2022, 7:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 22 2022, 7:27 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B177008: Diff 446831.Jul 22 2022, 7:52 AM
Ericson2314 mentioned this in D117977: [cmake] Don't export `LLVM_TOOLS_INSTALL_DIR` anymore.Jul 22 2022, 8:08 AM
mstorsjo added a subscriber: mstorsjo.Jul 22 2022, 1:10 PM

I don't find any existing instances of CLANG_TOOLS_INSTALL_DIR anywhere in the current monorepo - that doesn't seem right?

mstorsjo accepted this revision.Jul 22 2022, 1:11 PM

LGTM

This revision is now accepted and ready to land.Jul 22 2022, 1:11 PM
mstorsjo added a comment.Jul 22 2022, 1:21 PM
In D130362#3672886, @mstorsjo wrote:

I don't find any existing instances of CLANG_TOOLS_INSTALL_DIR anywhere in the current monorepo - that doesn't seem right?

(I looked in a slightly outdated working dir that I hadn't updated in a couple days - sorry for the noise!)

This revision was landed with ongoing or failed builds.Jul 23 2022, 9:26 AM
Closed by commit rG32560211c620: Fix one stray `{LLVM -> CLANG}_TOOLS_INSTALL_DIR` (authored by Ericson2314). · Explain Why
This revision was automatically updated to reflect the committed changes.
Ericson2314 added a commit: rG32560211c620: Fix one stray `{LLVM -> CLANG}_TOOLS_INSTALL_DIR`.
tstellar added a comment.Jul 25 2022, 7:00 AM

Thanks for the fix.

Revision Contents

PathSize
clang/
utils/
hmaptool/
2 lines

Diff 447078

clang/utils/hmaptool/CMakeLists.txt

install(PROGRAMS hmaptool DESTINATION "${LLVM_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool)
add_custom_target(hmaptool ALL DEPENDS "hmaptool") add_custom_target(hmaptool ALL DEPENDS "hmaptool")
set_target_properties(hmaptool PROPERTIES FOLDER "Utils") set_target_properties(hmaptool PROPERTIES FOLDER "Utils")
if(NOT LLVM_ENABLE_IDE) if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-hmaptool" add_llvm_install_targets("install-hmaptool"
DEPENDS hmaptool DEPENDS hmaptool
COMPONENT hmaptool) COMPONENT hmaptool)
endif() endif()