diff options
| author | jlam <jlam@pkgsrc.org> | 2004-09-22 23:00:26 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-09-22 23:00:26 +0000 |
| commit | fbe4ac354a202935de42dc59eb5a474e0906789e (patch) | |
| tree | 98c66dc06ac81c971883986c7a9af60f19855d2f /mk/wrapper/gen-transform.sh | |
| parent | 4ae6a6af806b53e71126f918ed759ff78fa4f390 (diff) | |
| download | pkgsrc-fbe4ac354a202935de42dc59eb5a474e0906789e.tar.gz | |
When mangling paths, also do (and undo) the transformations for full
paths to static archives and libtool archives. This should fix the
problem where a mangled path sometimes makes its way into the the
executed command line.
Diffstat (limited to 'mk/wrapper/gen-transform.sh')
| -rw-r--r-- | mk/wrapper/gen-transform.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/wrapper/gen-transform.sh b/mk/wrapper/gen-transform.sh index ceb9b25e213..47ad122836a 100644 --- a/mk/wrapper/gen-transform.sh +++ b/mk/wrapper/gen-transform.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: gen-transform.sh,v 1.1 2004/09/21 15:01:41 jlam Exp $ +# $NetBSD: gen-transform.sh,v 1.2 2004/09/22 23:00:26 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -165,8 +165,9 @@ EOF ;; ############################################################## # mangle:src:dst - # Change "src" into "dst" and "src/*" into "dst/*", and the - # same in -I, -L, and rpath options. + # Change "src" into "dst" and "src/*" into "dst/*" in -I, + # -L, and rpath options, and also in full paths to + # libraries. ############################################################## mangle) case $_action in @@ -406,14 +407,15 @@ EOF ;; ############################################################## # sub-mangle:src:dst - # Change "src/*" into "dst/*", and the same in -I, -L, and - # rpath options. + # Change "src/*" into "dst/*" in -I, -L, and rpath + # options, and also in full paths to libraries. ############################################################## sub-mangle) case $_action in transform|untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" #gen $_action "opt-sub:$1:$2" + gen $_action "libpath:$1:$2" gen $_action "opt-sub:-I$1:-I$2" gen $_action "opt-sub:-L$1:-L$2" gen $_action "sub-rpath:$1:$2" |