compilerplugins/Makefile-clang.mk | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit 6583b2fb941d90fd4701d3635458cd44d759dc93 Author: Luboš Luňák <[email protected]> AuthorDate: Tue Jun 25 09:37:18 2019 +0200 Commit: Luboš Luňák <[email protected]> CommitDate: Tue Jun 25 19:47:42 2019 +0200 help compilerplugins generator find clang shared libs, if needed Change-Id: I892aa42bc1e94823ab52cdfd6a855bf90106306d Reviewed-on: https://gerrit.libreoffice.org/74681 Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 263fd949979f..050c206e121d 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -208,6 +208,12 @@ CLANGTOOLLIBS = -lclangTooling -lclangDriver -lclangFrontend -lclangParse -lclan -lclangAST -lclangLex -lclangSerialization -lclangBasic $(shell $(LLVMCONFIG) --ldflags --libs --system-libs) # Path to the clang system headers (no idea if there's a better way to get it). CLANGTOOLDEFS = -DCLANGSYSINCLUDE=$(shell $(LLVMCONFIG) --libdir)/clang/$(shell $(LLVMCONFIG) --version | sed 's/svn//')/include +ifneq ($(OS),WNT) +ifneq ($(CLANGDIR),/usr) +# Help the generator find Clang shared libs, if Clang is built so and installed in a non-standard prefix. +CLANGTOOLLIBS += -Wl,--rpath,$(shell $(LLVMCONFIG) --libdir) +endif +endif $(CLANGOUTDIR)/sharedvisitor/generator$(CLANG_EXE_EXT): $(CLANGINDIR)/sharedvisitor/generator.cxx \ | $(CLANGOUTDIR)/sharedvisitor commit abee0de4f1af9ea14aa6a0c29ba07ba7ff6e61f0 Author: Luboš Luňák <[email protected]> AuthorDate: Tue Jun 25 09:20:05 2019 +0200 Commit: Luboš Luňák <[email protected]> CommitDate: Tue Jun 25 19:47:29 2019 +0200 try to find out CLANGDIR automatically Change-Id: I21fbcdc947c9ce5d99b14c1aba8fb4e1fb2d9c00 Reviewed-on: https://gerrit.libreoffice.org/74680 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins Reviewed-by: Luboš Luňák <[email protected]> diff --git a/configure.ac b/configure.ac index 21061c96597b..f5da5f5c5231 100644 --- a/configure.ac +++ b/configure.ac @@ -6839,7 +6839,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then dnl The prefix where Clang resides, override to where Clang resides if dnl using a source build: if test -z "$CLANGDIR"; then - CLANGDIR=/usr + CLANGDIR=$(dirname $(dirname $($CXX -print-prog-name=$(basename $CXX)))) fi AC_LANG_PUSH([C++]) save_CPPFLAGS=$CPPFLAGS _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
