summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2018-03-02 14:19:58 -0500
committerBen Gamari <ben@smart-cactus.org>2018-03-02 15:41:04 -0500
commit4a0d0d8062a204b867fc510c50e69a056ce7636f (patch)
tree0168120d4d35fa80a4512934ffc331ce0ca502ff /configure.ac
parentaef2b429072e3d3bbdbcb9e4082a0d86ba329d9e (diff)
downloadhaskell-4a0d0d8062a204b867fc510c50e69a056ce7636f.tar.gz
Various Windows / Cross Compile to Windows fixes
- Adds quick-cross-ncg flavour. - Fix windows wchar with `_s` for mingw - Lookup windres, dllwrap and objdump - Fix type. Reviewers: bgamari, hvr, Phyx, erikd, simonmar Reviewed By: bgamari Subscribers: rwbarton, thomie, erikd, carter Differential Revision: https://phabricator.haskell.org/D4430
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 216f43fa7c..1d3effbd26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,6 +418,10 @@ then
AC_PATH_PROG([DllWrap],[dllwrap])
AC_PATH_PROG([Windres],[windres])
AC_PATH_PROG([Genlib],[genlib])
+else
+ AC_CHECK_TARGET_TOOL([Windres],[windres])
+ AC_CHECK_TARGET_TOOL([DllWrap],[dllwrap])
+ AC_CHECK_TARGET_TOOL([OBJDUMP],[objdump])
fi
DllWrapCmd="$DllWrap"