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

[Luboš Luňák]

 compilerplugins/Makefile-clang.mk |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit c3de6c1a58678a29cee3dcd2d71c8d5127146945
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Feb 7 17:00:50 2013 +0100

    create an output dir that's already needed by $(shell ...)
    
    Otherwise there's an error message e.g. during a clean build.
    
    Change-Id: I42efd08e014a4ebe25cfd1a497f622e5ea5c39ad

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index b6c9901..688ab42 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -35,7 +35,8 @@ compilerplugins: compilerplugins-build
 CLANGSRC=$(foreach src,$(wildcard $(CLANGINDIR)/*.cxx), $(notdir $(src)))
 # Remember the sources and if they have changed, force plugin relinking.
 CLANGSRCCHANGED= \
-    $(shell echo $(CLANGSRC) | sort > $(CLANGOUTDIR)/sources-new.txt; \
+    $(shell mkdir -p $(CLANGOUTDIR) ; \
+            echo $(CLANGSRC) | sort > $(CLANGOUTDIR)/sources-new.txt; \
             if diff $(CLANGOUTDIR)/sources.txt $(CLANGOUTDIR)/sources-new.txt >/dev/null 2>/dev/null; then \
                 echo 0; \
             else \
commit 5535195c63b6add4fcc787053350a14cf0f1c0c2
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Feb 7 16:57:37 2013 +0100

    make sure the default target for compilerplugins is building
    
    CLANGFORCE was the first in the makefile after
    c6ffe17631cccf11fbe00479d2169116d494a7da and therefore the default
    
    Change-Id: Id3b86a1ea2c27479067f7f55a977da3e6e8a2dfb

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index 9d6aa14..b6c9901 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -29,6 +29,8 @@ CLANGINDIR=$(SRCDIR)/compilerplugins/clang
 # plugin will cause cache misses with ccache.
 CLANGOUTDIR=$(BUILDDIR)/compilerplugins/obj
 
+compilerplugins: compilerplugins-build
+
 # The list of source files, generated automatically (all files in clang/, but not subdirs).
 CLANGSRC=$(foreach src,$(wildcard $(CLANGINDIR)/*.cxx), $(notdir $(src)))
 # Remember the sources and if they have changed, force plugin relinking.
@@ -51,7 +53,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOUTDIR)/sources.txt
 $(CLANGOUTDIR)/sources.txt:
 	touch $@
 
-compilerplugins: $(CLANGOUTDIR) $(CLANGOUTDIR)/plugin.so
+compilerplugins-build: $(CLANGOUTDIR) $(CLANGOUTDIR)/plugin.so
 
 compilerplugins-clean:
 	rm -rf $(CLANGOUTDIR)