Skip to content

Commit

Permalink
Merge pull request Perl#70 from khwilliamson/master
Browse files Browse the repository at this point in the history
Some fixups, and printing to >&4 that needs review
  • Loading branch information
Tux authored May 31, 2021
2 parents bcb9bd3 + 32209b8 commit 9e6c692
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sufficient).

You have presumably obtained the metaconfig from the repository e.g.

$ git clone github.com:Perl/metaconfig metaconfig
$ git clone git@github.com:Perl/metaconfig metaconfig

When working with metaconfig you will generally have two git checkouts
next to each other: (1) this metaconfig checkout; and (2) a checkout of
Expand Down Expand Up @@ -84,7 +84,7 @@ Development workflow:
(aa) We have not yet arranged for metaconfig to use perl's versions of the
'units' by default so you need some housekeeping in the perl directory...

Then add metaconfig/bin to your $PATH or create aliases like
Add metaconfig/bin to your $PATH or create aliases like

$ export MC5=/your/path/to/metaconfig
$ alias ml="perl $MC5/bin/mlint -O"
Expand Down
8 changes: 4 additions & 4 deletions U/compline/ccflags.U
Original file line number Diff line number Diff line change
Expand Up @@ -156,26 +156,26 @@ esac
: think is an option
checkccflag='check=$1; flag=$2; callback=$3;
echo " ";
echo "Checking if your compiler accepts $flag" 2>&1;
echo "Checking if your compiler accepts $flag" >&4;
[ "X$sysroot" != "X" ] && echo "For sysroot = $sysroot";
echo "int main(void) { return 0; }" > gcctest.c;
if $cc $_sysroot -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then
echo "Yes, it does." 2>&1;
echo "Yes, it does." >&4;
if $test -s gcctest.out ; then
echo "But your platform does not like it:";
cat gcctest.out;
else
case "$ccflags" in
*$check*)
echo "Leaving current flags $ccflags alone." 2>&1
echo "Leaving current flags $ccflags alone." >&4
;;
*) dflt="$dflt $flag";
eval $callback
;;
esac
fi
else
echo "Nope, it does not, but that is ok." 2>&1;
echo "Nope, it does not, but that is ok." >&4;
fi
'

Expand Down
2 changes: 1 addition & 1 deletion U/perl/Checkcc.U
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ EOM
if $test -f UU/myread; then
. ./UU/myread
else
echo "Cannot find myread, sorry. Aborting." >&2
echo "Cannot find myread, sorry. Aborting." >&4
exit 1
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion U/perl/d_faststdio.U
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ case "$d_stdstdio:$d_stdio_ptr_lval" in
"$define:$define")
case "$d_stdio_cnt_lval$d_stdio_ptr_lval_sets_cnt" in
*$define*)
echo "You seem to have 'fast stdio' to directly manipulate the stdio buffers." >& 4
echo "You seem to have 'fast stdio' to directly manipulate the stdio buffers." >&4
val="$define"
;;
esac
Expand Down
6 changes: 3 additions & 3 deletions U/perl/perlxv.U
Original file line number Diff line number Diff line change
Expand Up @@ -478,12 +478,12 @@ fi
case "$nv_preserves_uv_bits" in
\-[1-9]*)
nv_preserves_uv_bits=`expr 0 - $nv_preserves_uv_bits`
$echo "Your NVs can preserve all $nv_preserves_uv_bits bits of your UVs." 2>&1
$echo "Your NVs can preserve all $nv_preserves_uv_bits bits of your UVs." >&4
d_nv_preserves_uv="$define"
;;
[1-9]*) $echo "Your NVs can preserve only $nv_preserves_uv_bits bits of your UVs." 2>&1
[1-9]*) $echo "Your NVs can preserve only $nv_preserves_uv_bits bits of your UVs." >&4
d_nv_preserves_uv="$undef" ;;
*) $echo "Can't figure out how many bits your NVs preserve." 2>&1
*) $echo "Can't figure out how many bits your NVs preserve." >&4
nv_preserves_uv_bits="0" ;;
esac
$rm_try
Expand Down

0 comments on commit 9e6c692

Please sign in to comment.