Skip to content

Commit

Permalink
Revert "bin/package: don't test-compile using possibly broken dev shell"
Browse files Browse the repository at this point in the history
This reverts commit 600cb18.
$cc may be a system compiler binary, it is not necessarily a
src/cmd/INIT/cc.* wrapper script; so prefixing 'sh' is wrong.
  • Loading branch information
McDutchie committed Jan 9, 2021
1 parent 4d0b77d commit e720283
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bin/package
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/INIT/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e720283

Please sign in to comment.