projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix platform detection in bindists
[ghc-hetmet.git]
/
distrib
/
prep-bin-dist-mingw
diff --git
a/distrib/prep-bin-dist-mingw
b/distrib/prep-bin-dist-mingw
index
6ee4d7e
..
f98bb88
100644
(file)
--- a/
distrib/prep-bin-dist-mingw
+++ b/
distrib/prep-bin-dist-mingw
@@
-115,6
+115,13
@@
if ! [ -d bin ] ; then
exit 1;
fi;
exit 1;
fi;
+if [ "`$mingw_bin/windres.exe --version | sed '1p;d'`" = "GNU windres 2.17.50 20060824" ]
+then
+ echo "Bad windres version for $mingw_bin/windres.exe."
+ echo "2.15.91 and 2.18.50 are known to work."
+ exit 1
+fi
+
echo "Removing configure script files...not needed"
rm -f config.guess config.sub configure configure.ac mkdirhier
rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
echo "Removing configure script files...not needed"
rm -f config.guess config.sub configure configure.ac mkdirhier
rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
@@
-144,6
+151,7
@@
cp $mingw_lib/* gcc-lib/
cp $mingw_bin/as.exe gcc-lib/
cp $mingw_bin/ld.exe gcc-lib/
cp $mingw_bin/ar.exe bin/
cp $mingw_bin/as.exe gcc-lib/
cp $mingw_bin/ld.exe gcc-lib/
cp $mingw_bin/ar.exe bin/
+cp $mingw_bin/windres.exe bin/
# Note: later versions of dlltool.exe depend on a bfd helper DLL.
cp $mingw_bin/dllwrap.exe gcc-lib/
cp $mingw_bin/dlltool.exe gcc-lib/
# Note: later versions of dlltool.exe depend on a bfd helper DLL.
cp $mingw_bin/dllwrap.exe gcc-lib/
cp $mingw_bin/dlltool.exe gcc-lib/
@@
-184,9
+192,6
@@
cp ${perl_dir}/perl56.dll .
echo "formatting documentation"
unix2dos < README > README.txt
rm README
echo "formatting documentation"
unix2dos < README > README.txt
rm README
-mv share/ghc/doc .
-rmdir share/ghc
-rmdir share
# Leave out pdf users_guide documentation for now; problematic to build with the versions
# of 'xsltproc' and 'fop' I've been able to lay my hands on.
# Leave out pdf users_guide documentation for now; problematic to build with the versions
# of 'xsltproc' and 'fop' I've been able to lay my hands on.