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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Feb 18 16:10:40 UTC 2019


 compilerplugins/Makefile-clang.mk |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit af8deb6b21b4e6888267c7fe385a102e2e7eba77
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 18 15:02:29 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Feb 18 17:10:17 2019 +0100

    make uninteresting code in clang's makefile to the uninteresting part
    
    Change-Id: I235284c7198aa2a295b4d81ff2f8e9ca554a4174
    Reviewed-on: https://gerrit.libreoffice.org/67971
    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 aad53a90ca5c..91a811a74eda 100644
--- a/compilerplugins/Makefile-clang.mk
+++ b/compilerplugins/Makefile-clang.mk
@@ -8,16 +8,6 @@
 
 # Make sure variables in this Makefile do not conflict with other variables (e.g. from gbuild).
 
-CLANG_COMMA :=,
-
-ifeq ($(OS),WNT)
-CLANG_DL_EXT = .dll
-CLANG_EXE_EXT = .exe
-else
-CLANG_DL_EXT = .so
-CLANG_EXE_EXT =
-endif
-
 # Compile flags ('make CLANGCXXFLAGS=-g' if you need to debug the plugin); you
 # may occasionally want to override these:
 ifeq ($(OS),WNT)
@@ -34,6 +24,16 @@ endif
 
 # The uninteresting rest.
 
+CLANG_COMMA :=,
+
+ifeq ($(OS),WNT)
+CLANG_DL_EXT = .dll
+CLANG_EXE_EXT = .exe
+else
+CLANG_DL_EXT = .so
+CLANG_EXE_EXT =
+endif
+
 # Clang headers require these.
 CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
 ifneq ($(OS),WNT)


More information about the Libreoffice-commits mailing list