Skip to content

Commit bb8ee61

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 5450a1c commit bb8ee61

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
@@ -1254,27 +1254,21 @@ if test "$opal_cv_asm_arch" != "WINDOWS" && test "$opal_cv_asm_builtin" != "BUIL
12541254
rm -rf conftest.*
12551255
12561256
if test "$opal_cv_asm_file" = "" ; then
1257-
if test ! "$PERL" = "" ; then
1258-
# we have perl... Can we generate a file?
1259-
AC_MSG_CHECKING([whether possible to generate assembly file])
1260-
mkdir -p opal/asm/generated
1261-
opal_cv_asm_file="atomic-local.s"
1262-
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'
1263-
if AC_TRY_EVAL(opal_try) ; then
1264-
# save the warnings
1265-
cat conftest.out >&AC_FD_CC
1266-
AC_MSG_RESULT([yes])
1267-
else
1268-
# save output
1269-
cat conftest.out >&AC_FD_CC
1270-
opal_cv_asm_file=""
1271-
AC_MSG_RESULT([failed])
1272-
AC_MSG_WARN([Could not build atomic operations assembly file.])
1273-
AC_MSG_WARN([There will be no atomic operations for this build.])
1274-
fi
1257+
# Can we generate a file?
1258+
AC_MSG_CHECKING([whether possible to generate assembly file])
1259+
mkdir -p opal/asm/generated
1260+
opal_cv_asm_file="atomic-local.s"
1261+
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'
1262+
if AC_TRY_EVAL(opal_try) ; then
1263+
# save the warnings
1264+
cat conftest.out >&AC_FD_CC
1265+
AC_MSG_RESULT([yes])
12751266
else
1276-
AC_MSG_WARN([Could not find prebuilt atomic operations file and could not])
1277-
AC_MSG_WARN([find perl to attempt to generate a custom assembly file.])
1267+
# save output
1268+
cat conftest.out >&AC_FD_CC
1269+
opal_cv_asm_file=""
1270+
AC_MSG_RESULT([failed])
1271+
AC_MSG_WARN([Could not build atomic operations assembly file.])
12781272
AC_MSG_WARN([There will be no atomic operations for this build.])
12791273
fi
12801274
fi

0 commit comments

Comments
 (0)