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

[Luboš Luňák (via logerrit)]

 compilerplugins/Makefile-clang.mk   |    4 ++--
 solenv/gbuild/PrecompiledHeaders.mk |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 4645ea2ba40b529cbd5cf28ce65083d51b8a1772
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 10 10:58:24 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Feb 10 14:38:17 2020 +0100

    ignore -DGLM_FORCE_CTOR_INIT for shared PCH
    
    It's not used by the PCH, so it's safe.
    
    Change-Id: Ia86bf0ff31bc40b81b10517f8abd33e9170dba2a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88362
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index b7b22b954872..55dcb332312d 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -140,6 +140,7 @@ gb_PrecompiledHeader_ignore_flags_system := \
 -DOOO_DLLIMPLEMENTATION_TEST \
 -DSK_USER_CONFIG_HEADER=% \
 -DSKIA_DLL \
+-DGLM_FORCE_CTOR_INIT \
 -include $(SRCDIR)/pch/inc/clangfix.hxx \
 
 # Probably also update pch/inc/clangfix.hxx if you extend the list.
commit a364218abec6ed067d4b1cf00716056a67d0601f
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 10 10:44:26 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Feb 10 14:38:05 2020 +0100

    sort compilerplugin sources
    
    We generally sort sources for each target in LO, so make this
    consistent/nicer :).
    
    Change-Id: I4c8bc0d9e3f0b2d8b966bd90215c960c30ea2f86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88361
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk
index 29bc89c6b2a2..543ec27aad44 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -127,7 +127,7 @@ CLANGSRCOUTDIR=$(CLANGOUTDIR)/sharedvisitor/sharedvisitor.cxx
 CLANGSRC+=$(CLANGSRCOUTDIR)
 endif
 # The list of source files, generated automatically (all files in clang/, but not subdirs).
-CLANGSRCINDIR=$(foreach src,$(wildcard $(CLANGINDIR)/*.cxx), $(notdir $(src)))
+CLANGSRCINDIR=$(sort $(foreach src,$(wildcard $(CLANGINDIR)/*.cxx), $(notdir $(src))))
 CLANGSRC+=$(CLANGSRCINDIR)
 
 # Remember the sources and if they have changed, force plugin relinking.
@@ -234,7 +234,7 @@ $(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang$(CLANG_EXE_EXT) $(BUILDDIR
 
 
 ifdef LO_CLANG_SHARED_PLUGINS
-SHARED_SOURCES := $(shell grep -l "LO_CLANG_SHARED_PLUGINS" $(CLANGINDIR)/*.cxx)
+SHARED_SOURCES := $(sort $(shell grep -l "LO_CLANG_SHARED_PLUGINS" $(CLANGINDIR)/*.cxx))
 SHARED_SOURCE_INFOS := $(foreach source,$(SHARED_SOURCES),$(patsubst $(CLANGINDIR)/%.cxx,$(CLANGOUTDIR)/sharedvisitor/%.plugininfo,$(source)))
 
 $(CLANGOUTDIR)/sharedvisitor/%.plugininfo: $(CLANGINDIR)/%.cxx \