configure.ac | 6 +++++- solenv/gbuild/platform/WNT_INTEL_GCC.mk | 5 +++-- tools/Library_tl.mk | 8 -------- 3 files changed, 8 insertions(+), 11 deletions(-)
New commits: commit 3d4c9f20c2e468e28f4d217d66862de2cb1cb365 Author: Jan Holesovsky <[email protected]> Date: Thu Nov 8 10:16:36 2012 +0100 MinGW: Silence [build LNK]. ie. don't show "Creating library file:" message. Change-Id: Ic6e40ac8955e4b8677cec57c51e2346901133e0a diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index c54a710..f1e7d28 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -161,7 +161,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(LIBS) \ -Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \ -Wl$(COMMA)--out-implib$(COMMA)$(1) \ - -o $(dir $(1))/$(notdir $(DLLTARGET)))) + -o $(dir $(1))/$(notdir $(DLLTARGET))) \ + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) endef define gb_LinkTarget__command_staticlinklibrary @@ -174,7 +175,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),@$(extraobjectlist)) \ - $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) + $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) endef define gb_LinkTarget__command commit 02084b175fd3cbaa77889b102e4e0ed41b0cae45 Author: Jan Holesovsky <[email protected]> Date: Thu Nov 8 09:43:13 2012 +0100 Revert "Don't export zlib symbols" Not needed after having fixed the MinGW visibility checks. This reverts commit 2f0b0e54f45cd9694d07d9e0399cd39bc465c09e. diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index 98ee848..cd8afec 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -106,14 +106,6 @@ $(eval $(call gb_Library_use_external,tl,zlib)) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) - -$(eval $(call gb_Library_add_libs,tl,\ - -Wl$(COMMA)--exclude-libs=libzlib.a \ -)) - -endif - $(eval $(call gb_Library_set_include,tl,\ -I$(SRCDIR)/tools/win/inc \ $$(INCLUDE) \ commit f102d993270fbb7b429cec5c34cfd73acfe213b1 Author: Jan Holesovsky <[email protected]> Date: Thu Nov 8 09:41:32 2012 +0100 MinGW: Fix visibility checks. Change-Id: I7f2718a60d55f5d99275646875a64e53c805b210 diff --git a/configure.ac b/configure.ac index b018638..09d4722 100644 --- a/configure.ac +++ b/configure.ac @@ -342,6 +342,10 @@ cygwin*|interix*|mingw32*) _os=WINNT use_shl_version="TRUE" DYNAMIC_CRT="TRUE" + + DLLPOST=".dll" + LINKFLAGSNOUNDEFS= + # If the host OS matches "mingw32*", that means we are using the # MinGW cross-compiler, because we don't see the point in building # LibreOffice using MinGW on Windows. If you want to build on @@ -5572,7 +5576,7 @@ _ACEOF else case "$host_cpu" in i?86|x86_64) - if test "$_os" = "Darwin"; then + if test "$_os" = "Darwin" -o "$WITH_MINGW" = "yes"; then gccvisbroken=no else if $EGREP -q '@PLT|@GOT' visibility.s; then _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
