From 5c33a6ba65e4ae4ddac34e3372c962dd49fb6e43 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 5 Mar 2020 14:14:09 +0100 Subject: [PATCH] util/wrap.pl: do not look at EXE_SHELL Acting on EXE_SHELL was a bit over the top, especially in light of instructions like this (from NOTES.VALGRIND): EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q" Fixes #11255 Reviewed-by: Nicola Tuveri Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/11258) --- util/wrap.pl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/util/wrap.pl b/util/wrap.pl index 1c3b4e7c29..4c3d4713f1 100755 --- a/util/wrap.pl +++ b/util/wrap.pl @@ -19,11 +19,7 @@ $ENV{OPENSSL_MODULES} = $std_providers my $use_system = 0; my @cmd; -if (($ENV{EXE_SHELL} // '') ne '') { - # We don't know what $ENV{EXE_SHELL} contains, so we must use the one - # string form to ensure that exec invokes a shell as needed. - @cmd = ( join(' ', $ENV{EXE_SHELL}, @ARGV) ); -} elsif (-x $unix_shlib_wrap) { +if (-x $unix_shlib_wrap) { @cmd = ( $unix_shlib_wrap, @ARGV ); } else { # Hope for the best -- 2.25.1