From: Grisha Levit <grishalevit@gmail.com>
Date: Wed, 16 Apr 2025 03:34:11 +0000 (-0400)
Subject: Ensure that the configuration cleans up conftest.dSYM directories.
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=5b239e62dfc8e3c3f0d874710f39d273bd2a023e;p=gnulib.git

Ensure that the configuration cleans up conftest.dSYM directories.

* m4/gnulib-common.m4 (gl_CC_ALLOW_WARNINGS, gl_CXX_ALLOW_WARNINGS):
Remove conftest* files and directories recursively.
* m4/asm-underscore.m4 (gl_ASM_SYMBOL_PREFIX, gl_C_ASM): Likewise.
* m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): Likewise.
* m4/warnings.m4 (gl_CC_INHIBIT_WARNINGS, gl_CXX_INHIBIT_WARNINGS):
Likewise.

Copyright-paperwork-exempt: Yes
---

diff --git a/ChangeLog b/ChangeLog
index 28322a2655..bdc4e026b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2025-04-16  Grisha Levit  <grishalevit@gmail.com>  (tiny change)
+
+	Ensure that the configuration cleans up conftest.dSYM directories.
+	* m4/gnulib-common.m4 (gl_CC_ALLOW_WARNINGS, gl_CXX_ALLOW_WARNINGS):
+	Remove conftest* files and directories recursively.
+	* m4/asm-underscore.m4 (gl_ASM_SYMBOL_PREFIX, gl_C_ASM): Likewise.
+	* m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): Likewise.
+	* m4/warnings.m4 (gl_CC_INHIBIT_WARNINGS, gl_CXX_INHIBIT_WARNINGS):
+	Likewise.
+
 2025-04-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	dfa: pacify gcc -Wstringop-overflow
diff --git a/m4/asm-underscore.m4 b/m4/asm-underscore.m4
index 035795a98a..ef1b51fc61 100644
--- a/m4/asm-underscore.m4
+++ b/m4/asm-underscore.m4
@@ -1,5 +1,5 @@
 # asm-underscore.m4
-# serial 5
+# serial 6
 dnl Copyright (C) 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -37,7 +37,7 @@ EOF
      else
        gl_cv_prog_as_underscore=no
      fi
-     rm -f conftest*
+     rm -fr conftest*
     ])
   if test $gl_cv_prog_as_underscore = yes; then
     USER_LABEL_PREFIX=_
@@ -67,7 +67,7 @@ MicrosoftCompiler
     ],
     [dnl Microsoft's 'cl' and 'clang-cl' produce an .asm file, whereas 'clang'
      dnl produces a .s file. Need to distinguish 'clang' and 'clang-cl'.
-     rm -f conftest*
+     rm -fr conftest*
      echo 'int dummy;' > conftest.c
      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c) >/dev/null 2>&1
      if test -f conftest.o; then
@@ -77,7 +77,7 @@ MicrosoftCompiler
        gl_asmext='asm'
        gl_c_asm_opt='-c -Fa'
      fi
-     rm -f conftest*
+     rm -fr conftest*
     ],
     [gl_asmext='s'
      gl_c_asm_opt='-S'
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 6eff85bea1..86cec5f674 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4
-# serial 107
+# serial 108
 dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -1304,7 +1304,7 @@ AC_DEFUN([gl_CC_ALLOW_WARNINGS],
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for C compiler option to allow warnings],
     [gl_cv_cc_wallow],
-    [rm -f conftest*
+    [rm -fr conftest*
      echo 'int dummy;' > conftest.c
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null
@@ -1317,7 +1317,7 @@ AC_DEFUN([gl_CC_ALLOW_WARNINGS],
      else
        gl_cv_cc_wallow=none
      fi
-     rm -f conftest*
+     rm -fr conftest*
     ])
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
@@ -1335,7 +1335,7 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS],
   if test -n "$CXX" && test "$CXX" != no; then
     AC_CACHE_CHECK([for C++ compiler option to allow warnings],
       [gl_cv_cxx_wallow],
-      [rm -f conftest*
+      [rm -fr conftest*
        echo 'int dummy;' > conftest.cc
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null
@@ -1348,7 +1348,7 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS],
        else
          gl_cv_cxx_wallow=none
        fi
-       rm -f conftest*
+       rm -fr conftest*
       ])
     case "$gl_cv_cxx_wallow" in
       none) GL_CXXFLAG_ALLOW_WARNINGS='' ;;
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
index f97ba73be5..6ca7721a32 100644
--- a/m4/host-cpu-c-abi.m4
+++ b/m4/host-cpu-c-abi.m4
@@ -1,5 +1,5 @@
 # host-cpu-c-abi.m4
-# serial 19
+# serial 20
 dnl Copyright (C) 2002-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -142,7 +142,7 @@ changequote([,])dnl
             else
               gl_cv_host_cpu_c_abi=arm
             fi
-            rm -f conftest*
+            rm -fr conftest*
            ])
          ;;
 
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index 5d7c4ef03a..c616d7751f 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -1,5 +1,5 @@
 # warnings.m4
-# serial 20
+# serial 21
 dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -114,7 +114,7 @@ AC_DEFUN([gl_CC_INHIBIT_WARNINGS],
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for C compiler option to inhibit all warnings],
     [gl_cv_cc_winhibit],
-    [rm -f conftest*
+    [rm -fr conftest*
      echo 'int dummy;' > conftest.c
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -w -c conftest.c 2>conftest2.err]) >/dev/null
@@ -123,7 +123,7 @@ AC_DEFUN([gl_CC_INHIBIT_WARNINGS],
      else
        gl_cv_cc_winhibit=none
      fi
-     rm -f conftest*
+     rm -fr conftest*
     ])
   case "$gl_cv_cc_winhibit" in
     none) GL_CFLAG_INHIBIT_WARNINGS='' ;;
@@ -146,7 +146,7 @@ AC_DEFUN([gl_CXX_INHIBIT_WARNINGS],
   if test -n "$CXX" && test "$CXX" != no; then
     AC_CACHE_CHECK([for C++ compiler option to inhibit all warnings],
       [gl_cv_cxx_winhibit],
-      [rm -f conftest*
+      [rm -fr conftest*
        echo 'int dummy;' > conftest.cc
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -w -c conftest.cc 2>conftest2.err]) >/dev/null
@@ -155,7 +155,7 @@ AC_DEFUN([gl_CXX_INHIBIT_WARNINGS],
        else
          gl_cv_cxx_winhibit=none
        fi
-       rm -f conftest*
+       rm -fr conftest*
       ])
     case "$gl_cv_cxx_winhibit" in
       none) GL_CXXFLAG_INHIBIT_WARNINGS='' ;;