Fix linking issue for new mxe and pthread
authorMiodrag Milanovic <mmicko@gmail.com>
Wed, 31 Jul 2019 16:02:27 +0000 (18:02 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 2 Aug 2019 14:55:14 +0000 (16:55 +0200)
Makefile

index 579fff00733b085c052becaf2010cc590e43a8c5..89155fae89bc58d51eb8694fec833fb1c512acf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,8 @@ CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
 LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
 LDLIBS := $(filter-out -lrt,$(LDLIBS))
 ABCMKARGS += ARCHFLAGS="-DWIN32_NO_DLL -DHAVE_STRUCT_TIMESPEC -fpermissive -w"
-ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="/usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc"
+# TODO: Try to solve pthread linking issue in more appropriate way
+ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" LDFLAGS="-Wl,--allow-multiple-definition" ABC_USE_NO_READLINE=1 CC="/usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc"
 EXE = .exe
 
 else ifeq ($(CONFIG),msys2)