Change everywhere we do a "rm -f conftest*" to "rm -rf conftest" to
cover the case where a subdirectory is also built that needs to be removed. Note that there are other macros that we don't control (AC, AM, and/or LT) that also exhibit this problem that we cannot fix. :-\ Fixes trac:1180. This commit was SVN r16669. The following Trac tickets were found above: Ticket 1180 --> https://svn.open-mpi.org/trac/ompi/ticket/1180
Этот коммит содержится в:
родитель
3616b03eb3
Коммит
748fc31906
@ -60,4 +60,4 @@ typedef struct { char x; $1 y; } ompi__type_alignof_;
|
||||
AC_DEFINE_UNQUOTED([$2], [$AS_TR_SH([ompi_cv_c_align_$1])], [Alignment of type $1])
|
||||
eval "$2=$AS_TR_SH([ompi_cv_c_align_$1])"
|
||||
|
||||
/bin/rm -f conftest* ]) dnl
|
||||
/bin/rm -rf conftest* ]) dnl
|
||||
|
@ -97,5 +97,5 @@ EOF
|
||||
fi
|
||||
|
||||
unset happy ompi_check_logical_fn
|
||||
/bin/rm -f conftest*
|
||||
/bin/rm -rf conftest*
|
||||
])dnl
|
||||
|
@ -91,7 +91,7 @@ EOF
|
||||
[$ompi_fortran_plain],
|
||||
[Whether fortran symbols have no trailing underscore or not])
|
||||
|
||||
rm -f conftest.*
|
||||
rm -rf conftest.*
|
||||
])dnl
|
||||
|
||||
|
||||
|
@ -85,7 +85,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine alignment of $1])])])
|
||||
|
||||
unset happy ompi_conf
|
||||
rm -f conftest*])
|
||||
rm -rf conftest*])
|
||||
|
||||
$2=AS_VAR_GET([type_var])
|
||||
AS_VAR_POPDEF([type_var])dnl
|
||||
|
@ -78,7 +78,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine size of $1])])])
|
||||
|
||||
unset happy ompi_conftest_h
|
||||
rm -f conftest*])
|
||||
rm -rf conftest*])
|
||||
|
||||
$2=AS_VAR_GET(type_var)
|
||||
AS_VAR_POPDEF([type_var])dnl
|
||||
|
@ -110,5 +110,5 @@ EOF
|
||||
[Fortran value for LOGICAL .TRUE. value])
|
||||
|
||||
unset happy ompi_print_logical_fn
|
||||
/bin/rm -f conftest*
|
||||
/bin/rm -rf conftest*
|
||||
])dnl
|
||||
|
@ -52,7 +52,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine kind of selected_int_kind($1)])])])
|
||||
|
||||
unset happy ompi_conftest_h
|
||||
rm -f conftest*])
|
||||
rm -rf conftest*])
|
||||
|
||||
$3=AS_VAR_GET(type_var)
|
||||
else
|
||||
|
@ -53,7 +53,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine precision of $1])])])
|
||||
|
||||
unset happy
|
||||
/bin/rm -f conftest*])
|
||||
/bin/rm -rf conftest*])
|
||||
|
||||
$2=AS_VAR_GET([type_var])
|
||||
AS_VAR_POPDEF([type_var])dnl
|
||||
|
@ -53,7 +53,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine range of $1])])])
|
||||
|
||||
unset happy
|
||||
/bin/rm -f conftest*])
|
||||
/bin/rm -rf conftest*])
|
||||
|
||||
$2=AS_VAR_GET([type_var])
|
||||
AS_VAR_POPDEF([type_var])dnl
|
||||
|
@ -78,7 +78,7 @@ EOF
|
||||
[AC_MSG_ERROR([Could not determine size of $1])])])
|
||||
|
||||
unset happy ompi_conftest_h
|
||||
rm -f conftest*])
|
||||
rm -rf conftest*])
|
||||
|
||||
$2=AS_VAR_GET(type_var)
|
||||
AS_VAR_POPDEF([type_var])dnl
|
||||
|
@ -56,4 +56,4 @@ fi
|
||||
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
/bin/rm -f conftest*])dnl
|
||||
/bin/rm -rf conftest*])dnl
|
||||
|
@ -84,5 +84,5 @@ EOF
|
||||
$6])
|
||||
|
||||
unset ompi_compiler ompi_flags ompi_output ompi_status
|
||||
/bin/rm -f conftest.* conftest
|
||||
/bin/rm -rf conftest.* conftest
|
||||
])dnl
|
||||
|
@ -256,7 +256,7 @@ $ompi_cv_asm_endproc ${sym}gsym_test_func
|
||||
break
|
||||
fi
|
||||
done
|
||||
rm -f conftest.*
|
||||
rm -rf conftest.*
|
||||
])dnl
|
||||
|
||||
|
||||
@ -437,7 +437,7 @@ EOF
|
||||
if test "$ompi_cv_asm_gnu_stack_result" != "yes" ; then
|
||||
ompi_cv_asm_gnu_stack_result="no"
|
||||
fi
|
||||
rm -f conftest.*],
|
||||
rm -rf conftest.*],
|
||||
[ompi_cv_asm_gnu_stack_result="no"])])
|
||||
if test "$ompi_cv_asm_gnu_stack_result" = "yes" ; then
|
||||
ompi_cv_asm_gnu_stack=1
|
||||
@ -803,7 +803,6 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
|
||||
AC_REQUIRE([OMPI_SETUP_CXX])
|
||||
AC_REQUIRE([AM_PROG_AS])
|
||||
|
||||
|
||||
AC_MSG_CHECKING([whether to enable smp locks])
|
||||
AC_ARG_ENABLE([smp-locks],
|
||||
[AC_HELP_STRING([--enable-smp-locks],
|
||||
@ -1019,7 +1018,7 @@ if test "$ompi_cv_asm_arch" != "WINDOWS" ; then
|
||||
else
|
||||
AC_MSG_RESULT([no (not in asm-data)])
|
||||
fi
|
||||
rm -f conftest.*
|
||||
rm -rf conftest.*
|
||||
|
||||
if test "$ompi_cv_asm_file" = "" ; then
|
||||
if test ! "$PERL" = "" ; then
|
||||
@ -1046,7 +1045,7 @@ if test "$ompi_cv_asm_arch" != "WINDOWS" ; then
|
||||
AC_MSG_WARN([There will be no atomic operations for this build.])
|
||||
fi
|
||||
fi
|
||||
rm -f conftest.*
|
||||
rm -rf conftest.*
|
||||
else
|
||||
# On windows with VC++, atomics are done with compiler primitives
|
||||
ompi_cv_asm_file=""
|
||||
|
@ -114,7 +114,7 @@ else
|
||||
fi
|
||||
|
||||
unset HAPPY ompi_conftest_h
|
||||
/bin/rm -f conftest*
|
||||
/bin/rm -rf conftest*
|
||||
# END: OMPI_INTL_PTHREAD_TRY_LINK_F77
|
||||
])dnl
|
||||
|
||||
|
@ -102,7 +102,7 @@ else
|
||||
fi
|
||||
|
||||
unset HAPPY ompi_conftest_h
|
||||
/bin/rm -f conftest*
|
||||
/bin/rm -rf conftest*
|
||||
# END: OMPI_INTL_SOLARIS_TRY_LINK_F77
|
||||
])dnl
|
||||
|
||||
|
@ -219,7 +219,7 @@ else
|
||||
fi
|
||||
|
||||
unset HAPPY ompi_conftest_h
|
||||
/bin/rm -f conftest*
|
||||
/bin/rm -rf conftest*
|
||||
|
||||
AC_LANG_POP(Fortran)
|
||||
])dnl
|
||||
|
@ -46,6 +46,6 @@ else
|
||||
cat conftest.s >&AC_FD_CC
|
||||
ifelse([$3],,:,[$3])
|
||||
fi
|
||||
rm -f conftest*
|
||||
rm -rf conftest*
|
||||
unset ompi_assemble
|
||||
])dnl
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user