[Libreoffice-commits] .: solenv/inc

Caolán McNamara caolan at kemper.freedesktop.org
Fri Jan 14 08:57:53 PST 2011


 solenv/inc/settings.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 29aaffb1fac0c58f126cacc2a9395e5191caaa8e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 14 16:57:46 2011 +0000

    ironically --enable-werror doesn't do anything if all modules set warningfree

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6180e30..bd4673f 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1243,11 +1243,13 @@ CDEFS+=$(JAVADEF)
 # .mk file for that platform should set COMPILER_WARN_ERRORS=TRUE and no longer
 # set MODULES_WITH_WARNINGS, and once no platform sets MODULES_WITH_WARNINGS any
 # longer, this code can go away:
-.IF "$(MODULES_WITH_WARNINGS)" != ""
+.IF "$(MODULES_WITH_WARNINGS)" == ""
+COMPILER_WARN_ERRORS=TRUE
+.ELSE
 MODULES_WITH_WARNINGS_1 := $(foreach,i,$(MODULES_WITH_WARNINGS) .$(i).)
 MODULES_WITH_WARNINGS_2 := $(subst,.$(PRJNAME)., $(MODULES_WITH_WARNINGS_1))
 .IF "$(MODULES_WITH_WARNINGS_1)" == "$(MODULES_WITH_WARNINGS_2)"
-COMPILER_WARN_ERRORS = TRUE
+COMPILER_WARN_ERRORS=TRUE
 .ENDIF
 .ENDIF
 


More information about the Libreoffice-commits mailing list