Skip to content

Commit c4b30d0

Browse files
committed
configury: remove some dead code
perl is now mandatory to build Open MPI, so there is no need to check for it Signed-off-by: Gilles Gouaillardet <[email protected]> (cherry picked from commit c8b51a2)
1 parent e599504 commit c4b30d0

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

config/opal_config_asm.m4

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,27 +1131,21 @@ if test "$opal_cv_asm_arch" != "WINDOWS" && test "$opal_cv_asm_builtin" != "BUIL
11311131
rm -rf conftest.*
11321132
11331133
if test "$opal_cv_asm_file" = "" ; then
1134-
if test ! "$PERL" = "" ; then
1135-
# we have perl... Can we generate a file?
1136-
AC_MSG_CHECKING([whether possible to generate assembly file])
1137-
mkdir -p opal/asm/generated
1138-
opal_cv_asm_file="atomic-local.s"
1139-
opal_try='$PERL $OPAL_TOP_SRCDIR/opal/asm/generate-asm.pl $opal_cv_asm_arch "$opal_cv_asm_format" $OPAL_TOP_SRCDIR/opal/asm/base $OPAL_TOP_BUILDDIR/opal/asm/generated/$opal_cv_asm_file >conftest.out 2>&1'
1140-
if AC_TRY_EVAL(opal_try) ; then
1141-
# save the warnings
1142-
cat conftest.out >&AC_FD_CC
1143-
AC_MSG_RESULT([yes])
1144-
else
1145-
# save output
1146-
cat conftest.out >&AC_FD_CC
1147-
opal_cv_asm_file=""
1148-
AC_MSG_RESULT([failed])
1149-
AC_MSG_WARN([Could not build atomic operations assembly file.])
1150-
AC_MSG_WARN([There will be no atomic operations for this build.])
1151-
fi
1134+
# Can we generate a file?
1135+
AC_MSG_CHECKING([whether possible to generate assembly file])
1136+
mkdir -p opal/asm/generated
1137+
opal_cv_asm_file="atomic-local.s"
1138+
opal_try='$PERL $OPAL_TOP_SRCDIR/opal/asm/generate-asm.pl $opal_cv_asm_arch "$opal_cv_asm_format" $OPAL_TOP_SRCDIR/opal/asm/base $OPAL_TOP_BUILDDIR/opal/asm/generated/$opal_cv_asm_file >conftest.out 2>&1'
1139+
if AC_TRY_EVAL(opal_try) ; then
1140+
# save the warnings
1141+
cat conftest.out >&AC_FD_CC
1142+
AC_MSG_RESULT([yes])
11521143
else
1153-
AC_MSG_WARN([Could not find prebuilt atomic operations file and could not])
1154-
AC_MSG_WARN([find perl to attempt to generate a custom assembly file.])
1144+
# save output
1145+
cat conftest.out >&AC_FD_CC
1146+
opal_cv_asm_file=""
1147+
AC_MSG_RESULT([failed])
1148+
AC_MSG_WARN([Could not build atomic operations assembly file.])
11551149
AC_MSG_WARN([There will be no atomic operations for this build.])
11561150
fi
11571151
fi

0 commit comments

Comments
 (0)