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

[Stephan Bergmann]

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

New commits:
commit 4d54e240262ffb2d2de1d72986f025657e230c77
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 30 09:11:54 2016 +0200

    Who needs that $(CLANGDIR)/tools/clang/include anyway?
    
    It was included ever since 02a8d36ebf3d54784903f2899eafe010bedf2f4c "initial
    support for clang compiler plugins" but will probably point at either a non-
    existing dir or a dir in the Clang source tree (that does not even contain all
    the include files that the corresponding installation dir would contain, as some
    include files are generated during the build).  For a properly installed LLVM/
    Clang, all include files should be found underneath a single include/ dir.
    
    Change-Id: Ie23cb1ae701eed1ee78448eb6c828d07b15121c2

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index cc2bdc7..5939868 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -25,8 +25,7 @@ CLANGCXXFLAGS=-O2 -Wall -Wextra -Wundef -g
 # Clang headers require these.
 CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti
 # All include locations needed.
-CLANGINCLUDES=$(if $(filter /usr,$(CLANGDIR)),,-isystem $(CLANGDIR)/include) \
-			  -isystem $(CLANGDIR)/tools/clang/include
+CLANGINCLUDES=$(if $(filter /usr,$(CLANGDIR)),,-isystem $(CLANGDIR)/include)
 
 # Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting
 # plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify