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.

diff --git a/ChangeLog b/ChangeLog
index b9c2039d57c238bdf3a1321a0f5da11e9bddc4f4..34bfef5e4f8a7951ee1a22edae90b8661c519ea6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/configure.ac b/configure.ac
index 806b1b4f30863eb65408f536945d9c5cfdf0c4ad..ef7506e726d61611b83cd21eed211d3d01820687 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/src/ChangeLog b/src/ChangeLog
index 5d2e75577b9d37874ff1a31ea13d2cdd0f38a4ea..90c66eb470533075e2a99e36a3ad254c72d5db5e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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)

diff --git a/src/Makefile.in b/src/Makefile.in
index 0dc48868dd84bceb1812f3880d06d78f194c10a0..3f1192fe3ff80e910fa9b054667b68ad4f501f75 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -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