diff options
| author | jlam <jlam> | 2004-01-21 13:52:56 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-21 13:52:56 +0000 |
| commit | f4f364f5a7447392531dcfb5047f298a0faba741 (patch) | |
| tree | 7f2610cff80b9991ada0377baabc7cbf83e664e9 /mk | |
| parent | 77090b23ef1b60e4d0cc1c74291f942db98eaee8 (diff) | |
| download | pkgsrc-f4f364f5a7447392531dcfb5047f298a0faba741.tar.gz | |
Put more debugging information in .work.log: first output the command the
wrapper script will transform, then output the transformed command.
Prefix the original command with [*] and the transformed command with <.>
to ease scanning of .work.log.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/libtool.sh | 7 | ||||
| -rw-r--r-- | mk/buildlink3/wrapper.sh | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mk/buildlink3/libtool.sh b/mk/buildlink3/libtool.sh index 02748f8aa16..248c33913ea 100644 --- a/mk/buildlink3/libtool.sh +++ b/mk/buildlink3/libtool.sh @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: libtool.sh,v 1.10 2004/01/11 03:30:20 grant Exp $ +# $NetBSD: libtool.sh,v 1.11 2004/01/21 13:52:56 jlam Exp $ Xsed='@SED@ -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' @@ -40,6 +40,9 @@ WRKSRC="@WRKSRC@" # Argument buffers buf1=; buf2=; buf3=; buf4=; buf5= +original_cmd="$0 $@" +$echo [*] $original_cmd >> $wrapperlog + # Discover the libtool mode by examining the argument list. mode=link prevopt= @@ -162,7 +165,7 @@ esac @_BLNK_WRAP_ENV@ @_BLNK_WRAP_SANITIZE_PATH@ -$echo $cmd >> $wrapperlog +$echo "<.>" $cmd >> $wrapperlog eval $cmd wrapper_result=$? diff --git a/mk/buildlink3/wrapper.sh b/mk/buildlink3/wrapper.sh index 3937ca5112d..83464a54e7e 100644 --- a/mk/buildlink3/wrapper.sh +++ b/mk/buildlink3/wrapper.sh @@ -1,6 +1,6 @@ #!@BUILDLINK_SHELL@ # -# $NetBSD: wrapper.sh,v 1.6 2003/11/26 12:52:30 jlam Exp $ +# $NetBSD: wrapper.sh,v 1.7 2004/01/21 13:52:56 jlam Exp $ Xsed='@SED@ -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' @@ -37,6 +37,9 @@ WRKSRC="@WRKSRC@" # Argument buffers buf1=; buf2=; buf3=; buf4=; buf5= +original_cmd="$0 $@" +$echo [*] $original_cmd >> $wrapperlog + cmd="@WRAPPEE@" set -- "$@" @_BLNK_WRAP_EXTRA_FLAGS@ while $test $# -gt 0 -o -n "${buf1}${buf2}${buf3}${buf4}${buf5}"; do @@ -73,5 +76,5 @@ done @_BLNK_WRAP_ENV@ @_BLNK_WRAP_SANITIZE_PATH@ -$echo $cmd >> $wrapperlog +$echo "<.>" $cmd >> $wrapperlog eval exec $cmd |