[Libreoffice-commits] core.git: solenv/Executable_concat-deps.mk

Tor Lillqvist tml at iki.fi
Tue May 28 00:32:50 PDT 2013


 solenv/Executable_concat-deps.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d8a593a32b718c211fbec120fee26c0bc61f0fad
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 28 10:32:04 2013 +0300

    Fix Windows build of concat-deps
    
    Change-Id: I4c009618598714769f8b561640f69a4d1038339d

diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk
index 5d6a38e..f376c7c 100644
--- a/solenv/Executable_concat-deps.mk
+++ b/solenv/Executable_concat-deps.mk
@@ -9,8 +9,10 @@
 
 $(eval $(call gb_Executable_Executable,concat-deps))
 
+ifneq ($(OS),WNT)
 $(eval $(call gb_Executable_set_ldflags,concat-deps,\
     $(filter-out $(SOLARLIB),$$(LDFLAGS))))
+endif
 
 $(eval $(call gb_Executable_add_cobjects,concat-deps,\
 	solenv/bin/concat-deps, $(gb_COMPILEROPTFLAGS) \


More information about the Libreoffice-commits mailing list