summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-05-04 20:07:56 +0100
committerIan Lynagh <igloo@earth.li>2012-05-05 00:12:25 +0100
commit88f694dd488bfe475c7dfac20ad47781c5689785 (patch)
tree1a7ab5e9691fa667da3eca3e2318e8209115f5d7 /mk
parent376210565e4dff2679246c6ebbcdbb3163c9e8a5 (diff)
downloadhaskell-88f694dd488bfe475c7dfac20ad47781c5689785.tar.gz
Enable and fix building dynlibs on Win64
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index da13af1d93..fe0feb0121 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -119,7 +119,7 @@ SharedLibsPlatformList = \
i386-unknown-freebsd x86_64-unknown-freebsd \
i386-unknown-openbsd x86_64-unknown-openbsd \
i386-unknown-netbsd x86_64-unknown-netbsd \
- i386-unknown-mingw32 \
+ i386-unknown-mingw32 x86_64-unknown-mingw32 \
i386-apple-darwin x86_64-apple-darwin powerpc-apple-darwin
ifeq "$(SOLARIS_BROKEN_SHLD)" "NO"
@@ -632,7 +632,11 @@ endif
# Mingwex Library
#
HaveLibMingwEx = @HaveLibMingwEx@
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
DLLTOOL = inplace/mingw/bin/dlltool.exe
+else ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32"
+DLLTOOL = inplace/mingw/bin/x86_64-w64-mingw32-dlltool.exe
+endif
#-----------------------------------------------------------------------------
# Flex (currently unused, could be moved to glafp-utils)