From 7f73b15c57d65ae5ac5f05877f85efa26b308a35 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Tue, 19 Nov 2019 16:30:01 -0600 Subject: [PATCH 1/4] wrappers: Remove argument quoting from sh scripts Do not try to quote additional user arguments. Just repeat them verbatim. See pmodels/mpich#4171. --- src/env/mpicc.sh.in | 16 +--------------- src/env/mpicxx.sh.in | 16 +--------------- src/env/mpif77.sh.in | 27 +-------------------------- src/env/mpifort.sh.in | 27 +-------------------------- 4 files changed, 4 insertions(+), 82 deletions(-) diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index 764a2427ae7..8f89c651b61 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -101,7 +101,6 @@ static_mpi=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes - qarg=$arg case $arg in # ---------------------------------------------------------------- # Compiler options that affect whether we are linking or no @@ -184,24 +183,11 @@ for arg in "$@" ; do fi fi exit 0 - ;; - # ----------------------------------------------------------------- - # Other arguments. We are careful to handle arguments with - # quotes (we try to quote all arguments in case they include - # any spaces) - *\"*) - qarg="'"$arg"'" - ;; - *\'*) - qarg='\"'"$arg"'\"' - ;; - *) - qarg="'$arg'" ;; esac if [ $addarg = yes ] ; then - allargs="$allargs $qarg" + allargs="$allargs $arg" fi done diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index 1d393111fc8..31e21c42cd1 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -98,7 +98,6 @@ static_mpi=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes - qarg=$arg case $arg in # ---------------------------------------------------------------- # Compiler options that affect whether we are linking or no @@ -186,24 +185,11 @@ for arg in "$@" ; do fi fi exit 0 - ;; - # ----------------------------------------------------------------- - # Other arguments. We are careful to handle arguments with - # quotes (we try to quote all arguments in case they include - # any spaces) - *\"*) - qarg="'"$arg"'" - ;; - *\'*) - qarg='\"'"$arg"'\"' - ;; - *) - qarg="'$arg'" ;; esac if [ $addarg = yes ] ; then - allargs="$allargs $qarg" + allargs="$allargs $arg" fi done diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index 6b1115b4f25..bbd9ee4436b 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -104,7 +104,6 @@ static_mpi=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes - qarg=$arg case $arg in # ---------------------------------------------------------------- # Compiler options that affect whether we are linking or no @@ -195,26 +194,6 @@ for arg in "$@" ; do fi fi exit 0 - ;; - # ----------------------------------------------------------------- - # Other arguments. We are careful to handle arguments with - # quotes (we try to quote all arguments in case they include - # any spaces) - *\"*) - qarg="'"$arg"'" - case $arg in - -D*) - cppflags="$cppflags $qarg" - ;; - esac - ;; - *\'*) - qarg='\"'"$arg"'\"' - case $arg in - -D*) - cppflags="$cppflags $qarg" - ;; - esac ;; # The following are special args used to handle .F files when the @@ -262,13 +241,9 @@ for arg in "$@" ; do ;; # - end of special handling for .F files - *) - qarg="'$arg'" - ;; - esac if [ $addarg = yes ] ; then - allargs="$allargs $qarg" + allargs="$allargs $arg" fi done diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in index a5a15223a98..aaa07c61c89 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in @@ -117,7 +117,6 @@ static_mpi=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes - qarg=$arg case $arg in # ---------------------------------------------------------------- # Compiler options that affect whether we are linking or no @@ -204,26 +203,6 @@ for arg in "$@" ; do fi fi exit 0 - ;; - # ----------------------------------------------------------------- - # Other arguments. We are careful to handle arguments with - # quotes (we try to quote all arguments in case they include - # any spaces) - *\"*) - qarg="'"$arg"'" - case $arg in - -D*) - cppflags="$cppflags $qarg" - ;; - esac - ;; - *\'*) - qarg='\"'"$arg"'\"' - case $arg in - -D*) - cppflags="$cppflags $qarg" - ;; - esac ;; # The following are special args used to handle .F files when the # Fortran compiler itself does not handle these options @@ -271,13 +250,9 @@ for arg in "$@" ; do ;; # - end of special handling for .F files - *) - qarg="'$arg'" - ;; - esac if [ $addarg = yes ] ; then - allargs="$allargs $qarg" + allargs="$allargs $arg" fi done From e755c01b24c1970d95e4b92dda61c6f26c3a675b Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Wed, 20 Nov 2019 08:45:27 -0600 Subject: [PATCH 2/4] wrappers: Remove erroneous array expansion In the /bin/sh wrappers, allargs variable is a string. Remove array expansion that slipped in. Closes pmodels/mpich#1471. --- src/env/mpicc.sh.in | 4 ++-- src/env/mpicxx.sh.in | 4 ++-- src/env/mpif77.sh.in | 4 ++-- src/env/mpifort.sh.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index 8f89c651b61..b9368cf0409 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -247,9 +247,9 @@ if [ "$linking" = yes ] ; then rc=$? else if [ "$static_mpi" = no ] ; then - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} else - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} fi rc=$? fi diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index 31e21c42cd1..ed431ebfd8d 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -245,9 +245,9 @@ if [ "$linking" = yes ] ; then rc=$? else if [ "$static_mpi" = no ] ; then - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} else - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} fi rc=$? fi diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index bbd9ee4436b..c4a0ba35352 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -299,9 +299,9 @@ if [ "$linking" = yes ] ; then rc=$? else if [ "$static_mpi" = no ] ; then - $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ else - $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs[@]}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ fi rc=$? fi diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in index aaa07c61c89..f4505b4ee6c 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in @@ -334,9 +334,9 @@ if [ "$linking" = yes ] ; then rc=$? else if [ "$static_mpi" = no ] ; then - $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ else - $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ fi rc=$? fi From 421bc9bed5cd1372f532ab6f5f675926e16e3dc2 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Wed, 20 Nov 2019 08:47:45 -0600 Subject: [PATCH 3/4] wrappers: Make allargs handling consistent Remove redundant quotes. Always use brackets. --- src/env/mpicc.sh.in | 8 ++++---- src/env/mpicxx.sh.in | 8 ++++---- src/env/mpif77.sh.in | 8 ++++---- src/env/mpifort.sh.in | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index b9368cf0409..f3345c68eba 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -243,18 +243,18 @@ fi # suppressing linking, such as -c or -M. if [ "$linking" = yes ] ; then if [ "$nativelinking" = yes ] ; then - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} $allargs -I$includedir + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} ${allargs} -I$includedir rc=$? else if [ "$static_mpi" = no ] ; then - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} else - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} fi rc=$? fi else - $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} $allargs -I$includedir + $Show $CC ${final_cppflags} $PROFILE_INCPATHS ${final_cflags} ${allargs} -I$includedir rc=$? fi diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index ed431ebfd8d..dd8d5d23b81 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -241,18 +241,18 @@ fi # libraries if [ "$linking" = yes ] ; then if [ "$nativelinking" = yes ] ; then - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} $allargs -I$includedir + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} ${allargs} -I$includedir rc=$? else if [ "$static_mpi" = no ] ; then - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} else - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} fi rc=$? fi else - $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} $allargs -I$includedir + $Show $CXX ${final_cppflags} $PROFILE_INCPATHS ${final_cxxflags} ${allargs} -I$includedir rc=$? fi diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index c4a0ba35352..e0441ae788d 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -295,18 +295,18 @@ fi # if [ "$linking" = yes ] ; then if [ "$nativelinking" = yes ] ; then - $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} $allargs -I$includedir + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} ${allargs} -I$includedir rc=$? else if [ "$static_mpi" = no ] ; then - $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ else - $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} "${allargs}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${final_ldflags} ${allargs} -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @F77_OTHER_LIBS@ fi rc=$? fi else - $Show $F77 $PROFILE_INCPATHS ${final_fflags} $allargs -I$includedir + $Show $F77 $PROFILE_INCPATHS ${final_fflags} ${allargs} -I$includedir rc=$? fi if [ -n "$rmfiles" ] ; then diff --git a/src/env/mpifort.sh.in b/src/env/mpifort.sh.in index f4505b4ee6c..3166a9481f7 100644 --- a/src/env/mpifort.sh.in +++ b/src/env/mpifort.sh.in @@ -330,18 +330,18 @@ fi # libraries if [ "$linking" = yes ] ; then if [ "$nativelinking" = yes ] ; then - $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} $allargs + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} ${allargs} rc=$? else if [ "$static_mpi" = no ] ; then - $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} ${allargs} $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ else - $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} "${allargs}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${final_ldflags} ${allargs} $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO ${wrapper_dl_type_flags} $libdir/lib@MPILIBNAME@.a @LPMPILIBNAME@ $PROFILE_POSTLIB ${final_libs} @FC_OTHER_LIBS@ fi rc=$? fi else - $Show $FC $PROFILE_INCPATHS ${final_fcflags} $allargs $FCINCDIRS $FCMODDIRS + $Show $FC $PROFILE_INCPATHS ${final_fcflags} ${allargs} $FCINCDIRS $FCMODDIRS rc=$? fi if [ -n "$rmfiles" ] ; then From 8c1dc8d8faf8692d85ae84a2743aa36639023951 Mon Sep 17 00:00:00 2001 From: Ken Raffenetti Date: Wed, 20 Nov 2019 08:52:02 -0600 Subject: [PATCH 4/4] [DNM]: Hack to force /bin/sh wrapper script usage --- configure.ac | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/configure.ac b/configure.ac index afec2f2df25..f7c43fb8c72 100644 --- a/configure.ac +++ b/configure.ac @@ -2668,27 +2668,6 @@ AC_PATH_PROG(BASH_SHELL,bash) # compliation scripts) by taking advantage of the array features in # bash. bashWorks=no -if test -x "$BASH_SHELL" ; then -changequote(%%,::)dnl - cat >>conftest <&1 >/dev/null ; then - bashWorks=yes - else - bashWorks=no - fi - rm -f conftest* - AC_MSG_RESULT($bashWorks) -fi dnl BUILD_BASH_SCRIPTS used to be an AC_SUBST AM_CONDITIONAL([BUILD_BASH_SCRIPTS], [test "x$bashWorks" = xyes])