[Libreoffice-commits] .: Branch 'libreoffice-3-6' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/LinkTarget.mk |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit e6c8e7752a742444e581f9248af1c1e33dbcbeb5
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Nov 23 07:11:05 2012 +0100

    ignore warnings in generated scanners
    
    Change-Id: I7c1e17ffba5b4e6d4f4229da8a93ac3db621253b
    (cherry picked from commit 26aae9238565de48324625315f2a44dba6f664d7)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index ccdfe49..0c7e476 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -895,11 +895,8 @@ endef
 # gb_LinkTarget_add_scanner(<component>,<scanner file>)
 define gb_LinkTarget_add_scanner
 $(call gb_LexTarget_LexTarget,$(2))
-ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3),-Wno-error)
-else
 $(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3))
-endif
+$(call gb_GenCxxObject_get_target,LexTarget/$(2)) : WARNINGS_NOT_ERRORS := $(true)
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_LexTarget_get_clean_target,$(2))
 
 endef