[Libreoffice-commits] .: solenv/gbuild

[Lubos Lunak]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c42a8d41afbd8c49b68046eeb8480e04d4f072c4
Author: Luboš Luňák <l.lu...@suse.cz>
Date:   Wed Jul 4 18:22:36 2012 +0200

    use -nologo with other MSVC build tools too
    
    Except for non-silent linking, where it would for some strange reason
    also disable printing of contents of response files (=objects to be linked).

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5629ee5..efb000e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -205,6 +205,7 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
        -DEXCEPTIONS_OFF \
 
 gb_LinkTarget_LDFLAGS := \
+       $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-nologo,) \
        -MANIFEST \
        $(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst 
\,/,$(ILIB))))) \
 
@@ -355,8 +356,8 @@ $(call gb_Helper_abbreviate_dirs,\
                $(if $(filter-out StaticLibrary,$(TARGETTYPE)),user32.lib) \
                $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); 
RC=$$?; rm $${RESPONSEFILE} \
        $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; 
fi) \
-       $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
-       $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
+       $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; 
then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest 
-outputresource:$(DLLTARGET)\;2; fi) \
+       $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then 
mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \
        ; exit $$RC)
 endef
 
@@ -670,6 +671,7 @@ $(call gb_Output_announce,$(2),$(true),RES,1)
 $(call gb_Helper_abbreviate_dirs,\
        mkdir -p $(dir $(1)) && \
        $(gb_RC) \
+               -nologo \
                $(DEFS) $(FLAGS) \
                $(INCLUDE) \
                -Fo$(1) \

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits