This is an archive of the discontinued LLVM Phabricator instance.

Differential D152608

GetClangResourceDir: Fix downstream projects that bundle llvm source
ClosedPublic

Authored by tstellar on Jun 9 2023, 9:56 PM.

Details

Reviewers
sebastian-ne
paperchalice
Commits
rGc951960e6596: GetClangResourceDir: Fix downstream projects that bundle llvm source
Summary

A project that bundles the llvm source code may have their own
PACKAGE_VERSION variable, so only use this to compute the
CLANG_RESOURCE_DIR if CLANG_VERSION_MAJOR is undefined.

Diff Detail

Unit TestsFailed

TimeTest
60,010 msx64 debian > lit.lit::max-failures.py

Event Timeline

tstellar created this revision.Jun 9 2023, 9:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 9 2023, 9:56 PM
tstellar requested review of this revision.Jun 9 2023, 9:56 PM
Harbormaster completed remote builds in B237918: Diff 530154.Jun 10 2023, 3:01 AM
sebastian-ne accepted this revision.Jun 12 2023, 1:24 AM

Thank you!

This revision is now accepted and ready to land.Jun 12 2023, 1:24 AM
This revision was landed with ongoing or failed builds.Jul 5 2023, 8:10 PM
Closed by commit rGc951960e6596: GetClangResourceDir: Fix downstream projects that bundle llvm source (authored by tstellar). · Explain Why
This revision was automatically updated to reflect the committed changes.
tstellar added a commit: rGc951960e6596: GetClangResourceDir: Fix downstream projects that bundle llvm source.
Herald added a project: Restricted Project. · View Herald TranscriptJul 5 2023, 8:10 PM

Revision Contents

PathSize
cmake/
Modules/
4 lines

Diff 530154

cmake/Modules/GetClangResourceDir.cmake

Context not available.
if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "") if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "")
set(ret_dir bin/${CLANG_RESOURCE_DIR}) set(ret_dir bin/${CLANG_RESOURCE_DIR})
else() else()
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION}) if (NOT CLANG_VERSION_MAJOR)
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
endif()
set(ret_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}) set(ret_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR})
endif() endif()
Context not available.