Commit 0d880e73 authored by Karol Ostrovsky's avatar Karol Ostrovsky Committed by Eli Zaretskii

Fix bug #18302 with minor issues in the MSYS2/MinGW64 build.

 configure.ac: Accept "*-mingw*", not just "*-mingw32", as
 canonical name of a MinGW build, because using MSYS2 'uname'
 produces "MINGW64".

 src/Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
 if the initial "rm -f" fails.  This is for MinGW builds, where
 MS-Windows will not allow deleting the executable file of a
 running program.
parent 30f1ca3b
2014-08-23 Karol Ostrovsky <karol.ostrovsky@gmail.com> (tiny change)
* configure.ac: Accept "*-mingw*", not just "*-mingw32", as
canonical name of a MinGW build, because using MSYS2 'uname'
produces "MINGW64".
2014-08-21 Ken Brown <kbrown@cornell.edu>
* configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the
......
......@@ -650,7 +650,7 @@ case "${canonical}" in
i[3456]86-*-* )
case "${canonical}" in
*-darwin* ) opsys=darwin ;;
*-mingw32 )
*-mingw* )
opsys=mingw32
# MinGW overrides and adds some system headers in nt/inc.
GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
......@@ -665,7 +665,7 @@ case "${canonical}" in
# MinGW64
x86_64-*-* )
case "${canonical}" in
*-mingw32 )
*-mingw* )
opsys=mingw32
# MinGW overrides and adds some system headers in nt/inc.
GCC_TEST_OPTIONS="-I $srcdir/nt/inc"
......@@ -1323,7 +1323,7 @@ test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \
C_SWITCH_SYSTEM="-ma -qmaxmem=4000"
if test "$opsys" = "mingw32"; then
case "$canonical" in
x86_64-*-mingw32) C_SWITCH_SYSTEM="-mtune=generic" ;;
x86_64-*-mingw*) C_SWITCH_SYSTEM="-mtune=generic" ;;
*) C_SWITCH_SYSTEM="-mtune=pentium4" ;;
esac
fi
......
2014-08-23 Karol Ostrovsky <karol.ostrovsky@gmail.com> (tiny change)
* Makefile.in (emacs$(EXEEXT)): Retry deletion of bootstrap-emacs
if the initial "rm -f" fails. This is for MinGW builds, where
MS-Windows will not allow deleting the executable file of a
running program.
2014-08-20 Eli Zaretskii <eliz@gnu.org>
* w32term.c (w32_scroll_bar_handle_click)
......
......@@ -435,7 +435,9 @@ emacs$(EXEEXT): temacs$(EXEEXT) \
else \
LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \
test "X$(PAXCTL)" = X || $(PAXCTL) -zex emacs$(EXEEXT); \
rm -f bootstrap-emacs$(EXEEXT); \
while test -f bootstrap-emacs$(EXEEXT); do \
rm -f bootstrap-emacs$(EXEEXT); \
done; \
ln emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment