From e7202832fd386e2f928e013a20668ef863d8b8d3 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Sat, 9 Jan 2021 16:16:28 +0000 Subject: [PATCH] Revert "bin/package: don't test-compile using possibly broken dev shell" This reverts commit 600cb182. $cc may be a system compiler binary, it is not necessarily a src/cmd/INIT/cc.* wrapper script; so prefixing 'sh' is wrong. --- bin/package | 2 +- src/cmd/INIT/package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/package b/bin/package index b6c844a7f..aa8a1478f 100755 --- a/bin/package +++ b/bin/package @@ -2849,7 +2849,7 @@ cat $INITROOT/$i.sh ( cd "$TMPDIR" || exit 3 cp $INITROOT/hello.c pkg$$.c || exit 3 - sh $cc -o pkg$$.exe pkg$$.c > pkg$$.e 2>&1 || { + $cc -o pkg$$.exe pkg$$.c > pkg$$.e 2>&1 || { if $cc -Dnew=old -o pkg$$.exe pkg$$.c > /dev/null 2>&1 then echo "$command: ${warn}$CC: must be a C compiler (not C++)" >&2 else cat pkg$$.e diff --git a/src/cmd/INIT/package.sh b/src/cmd/INIT/package.sh index 40ba9fcd8..a47da92ea 100644 --- a/src/cmd/INIT/package.sh +++ b/src/cmd/INIT/package.sh @@ -2848,7 +2848,7 @@ cat $INITROOT/$i.sh ( cd "$TMPDIR" || exit 3 cp $INITROOT/hello.c pkg$$.c || exit 3 - sh $cc -o pkg$$.exe pkg$$.c > pkg$$.e 2>&1 || { + $cc -o pkg$$.exe pkg$$.c > pkg$$.e 2>&1 || { if $cc -Dnew=old -o pkg$$.exe pkg$$.c > /dev/null 2>&1 then echo "$command: ${warn}$CC: must be a C compiler (not C++)" >&2 else cat pkg$$.e