diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-05-23 09:13:43 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-05-23 09:13:43 +0100 |
| commit | 1fd06de4e98d1b659500ecd66d88d6d80fcc60d3 (patch) | |
| tree | 3e391a11438685a0262a29c5936c1c8819380ffc /aclocal.m4 | |
| parent | 033f897a8ad34d62aff585d9df16c640bb55f21c (diff) | |
| download | haskell-1fd06de4e98d1b659500ecd66d88d6d80fcc60d3.tar.gz | |
aclocal.m4: allow override of dllwrap and windres when cross-compiling
Commit 66108864540601837ad77847f4062a670362361f reverted ability
to override 'dllwrap' and 'windres' paths when cross-compiling.
After this change (and a few libraries/Win32 patches) I was able
to build cross-compiler to windows:
$ ./configure --target=i686-w64-mingw32 \
DllWrap=i686-w64-mingw32-dllwrap \
Windres=i686-w64-mingw32-windres
Later both 'dllwrap' and 'windres' should be derived from --target=
as we do now for 'CC', 'AR', 'NM' and others.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 697cba5690..7ad9c36453 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -479,8 +479,18 @@ AC_DEFUN([FP_SETTINGS], SettingsLdCommand="$LdCmd" SettingsArCommand="$ArCmd" SettingsPerlCommand="$PerlCmd" - SettingsDllWrapCommand="/bin/false" - SettingsWindresCommand="/bin/false" + if test -z "$DllWrap" + then + SettingsDllWrapCommand="/bin/false" + else + SettingsDllWrapCommand="$DllWrap" + fi + if test -z "$Windres" + then + SettingsWindresCommand="/bin/false" + else + SettingsWindresCommand="$Windres" + fi SettingsLibtoolCommand="libtool" SettingsTouchCommand='touch' fi |