[Libreoffice-commits] core.git: compilerplugins/Makefile-clang.mk

[Stephan Bergmann (via logerrit)]

 compilerplugins/Makefile-clang.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c62360e4cbb605020f9b6b0d40fcd60bca3994b7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 16 09:20:50 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jul 16 14:01:14 2019 +0200

    macOS ld doesn't know --rpath
    
    Change-Id: I4ebef2f15c409805adcd16916a9137b94e4ee535
    Reviewed-on: https://gerrit.libreoffice.org/75677
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index 050c206e121d..d2c07fd06dba 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -208,7 +208,7 @@ 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 ($(filter-out MACOSX WNT,$(OS)),)
 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)