summaryrefslogtreecommitdiff
path: root/libxml2
diff options
context:
space:
mode:
authortono <tono@openoffice.org>2010-05-31 21:53:32 +0900
committertono <tono@openoffice.org>2010-05-31 21:53:32 +0900
commit9bc06e6ac0d2031e6ed95229b0c1e1cf7d86ee90 (patch)
tree8e969c864bf1b0d87370851d03bf019f8c8cc535 /libxml2
parentd1d09abe2763b4dffe63db568cc1472505f057d5 (diff)
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2
Diffstat (limited to 'libxml2')
-rw-r--r--libxml2/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 9175391fbae8..057b92a8c121 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -57,17 +57,17 @@ PATCH_FILES=$(TARFILE_NAME).patch
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
PATCH_FILES+=$(TARFILE_NAME)-mingw.patch
-xml2_CC=$(CC)
+xml2_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
xml2_CC+=-shared-libgcc
.ENDIF
-xml2_LIBS=-lws2_32 -lmingwthrd
+xml2_LIBS=-lws2_32
.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
xml2_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
BUILD_ACTION=$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE