diff options
author | Rickard Green <[email protected]> | 2019-03-07 14:44:14 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2019-03-07 14:44:14 +0100 |
commit | 1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0 (patch) | |
tree | 72b36887e44850e3b0f47ccecbba609dbe4437c9 /erts/configure.in | |
parent | c6508315fbaeee2e442c5623237a58f7e168d145 (diff) | |
parent | fed10a7ed52488fc5de5873bf12443fc07097d89 (diff) | |
download | otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.tar.gz otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.tar.bz2 otp-1e05aaf67fdf7547d72e20ff5a272ad8912f9ae0.zip |
Merge branch 'rickard/make-fixes-21/OTP-15657' into maint
* rickard/make-fixes-21/OTP-15657:
Remove own configured RM make variable
Diffstat (limited to 'erts/configure.in')
-rw-r--r-- | erts/configure.in | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/erts/configure.in b/erts/configure.in index 53e8bd683a..3ba8216a19 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -792,11 +792,6 @@ AC_SUBST(LIBCARBON) _search_path=/bin:/usr/bin:/usr/local/bin:$PATH -AC_PATH_PROG(RM, rm, false, $_search_path) -if test "$ac_cv_path_RM" = false; then - AC_MSG_ERROR([No 'rm' command found]) -fi - AC_PATH_PROG(MKDIR, mkdir, false, $_search_path) if test "$ac_cv_path_MKDIR" = false; then AC_MSG_ERROR([No 'mkdir' command found]) @@ -811,9 +806,9 @@ _search_path= # Remove old configuration information. -# Next line should be placed after AC_PATH_PROG(RM, ...), but before -# first output to CONN_INFO. So this is just the right place. -$RM -f "$ERL_TOP/erts/CONF_INFO" +# Next line should be before first output to CONN_INFO. So this is +# just the right place. +rm -f "$ERL_TOP/erts/CONF_INFO" dnl Check if we should/can build a sharing-preserving emulator AC_MSG_CHECKING(if we are building a sharing-preserving emulator) @@ -851,7 +846,7 @@ fi ## Delete previous failed configure results if test -f doc/CONF_INFO; then - $RM doc/CONF_INFO + rm -f doc/CONF_INFO fi AC_CHECK_PROGS(XSLTPROC, xsltproc) @@ -3288,14 +3283,14 @@ if test "$enable_dtrace_test" = "yes" ; then AC_MSG_CHECKING([for 2-stage DTrace precompilation]) AC_TRY_COMPILE([ #include "foo-dtrace.h" ], [ERLANG_DIST_PORT_BUSY_ENABLED();], - [$RM -f $DTRACE_2STEP_TEST + [rm -f $DTRACE_2STEP_TEST dtrace -G $DTRACE_CPP $DTRACE_BITS_FLAG -Iemulator/beam -o $DTRACE_2STEP_TEST -s emulator/beam/erlang_dtrace.d conftest.$OBJEXT 2>&AS_MESSAGE_LOG_FD if test -f $DTRACE_2STEP_TEST; then - $RM $DTRACE_2STEP_TEST + rm -f $DTRACE_2STEP_TEST DTRACE_ENABLED_2STEP=yes fi], []) - $RM -f foo-dtrace.h + rm -f foo-dtrace.h AS_IF([test "x$DTRACE_ENABLED_2STEP" = "xyes"], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) @@ -3499,7 +3494,7 @@ ssl_done=yes # Default only one run # Remove all SKIP files from previous runs for a in ssl crypto ssh; do - $RM -f $ERL_TOP/lib/$a/SKIP + rm -f $ERL_TOP/lib/$a/SKIP done SSL_DYNAMIC_ONLY=$enable_dynamic_ssl @@ -4120,7 +4115,7 @@ need_java="jinterface ic/java_src" # Remove all SKIP files from previous runs for a in $need_java ; do - $RM -f $ERL_TOP/lib/$a/SKIP + rm -f $ERL_TOP/lib/$a/SKIP done if test "X$with_javac" = "Xno"; then @@ -4171,7 +4166,7 @@ dnl this deliberately does not believe that 'gcc' is a C++ compiler AC_CHECK_TOOLS(CXX, [$CCC c++ g++ CC cxx cc++ cl], false) # Remove SKIP file from previous run -$RM -f $ERL_TOP/lib/orber/SKIP +rm -f $ERL_TOP/lib/orber/SKIP if test "$CXX" = false; then echo "No C++ compiler found" > $ERL_TOP/lib/orber/SKIP |