diff options
| author | cube <cube@pkgsrc.org> | 2005-01-25 23:27:34 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2005-01-25 23:27:34 +0000 |
| commit | 07b9c2fded647e827fa1a6875c1a12572fad4009 (patch) | |
| tree | ca2573bcf8604ede4242a7ecb667d112aa1dac21 | |
| parent | 9c5baba768ef6e236930c80b567f14ea9fbd09a5 (diff) | |
| download | pkgsrc-07b9c2fded647e827fa1a6875c1a12572fad4009.tar.gz | |
Set argmatch=yes when we transform /some/where/libfoo.so into
-L/some/where -lfoo so that the arguments we push on the stack are actually
used in logic.
Should solve the issue build bash with option 'static' enabled reported on
netbsd-users.
OK'd by jlam@.
| -rw-r--r-- | mk/wrapper/arg-pp-main | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/wrapper/arg-pp-main b/mk/wrapper/arg-pp-main index 98f4eb4aabf..a03dc578be0 100644 --- a/mk/wrapper/arg-pp-main +++ b/mk/wrapper/arg-pp-main @@ -1,4 +1,4 @@ -# $NetBSD: arg-pp-main,v 1.1 2005/01/18 17:25:13 jlam Exp $ +# $NetBSD: arg-pp-main,v 1.2 2005/01/25 23:27:34 cube Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -51,6 +51,7 @@ case $arg in $debug_log $wrapperlog " (arg-pp-main) pre: -l$lib" prepend_queue argbuf "-L$dir" $debug_log $wrapperlog " (arg-pp-main) pre: -L$dir" + argmatch=yes ;; /*/lib*.sl|/*/lib*.sl.[0-9]*) # HP-UX dir="${arg%/lib*}" @@ -64,6 +65,7 @@ case $arg in $debug_log $wrapperlog " (arg-pp-main) pre: -l$lib" prepend_queue argbuf "-L$dir" $debug_log $wrapperlog " (arg-pp-main) pre: -L$dir" + argmatch=yes ;; /*/lib*.dylib) # Darwin dir="${arg%/lib*.dylib}" @@ -76,6 +78,7 @@ case $arg in $debug_log $wrapperlog " (arg-pp-main) pre: -l$lib" prepend_queue argbuf "-L$dir" $debug_log $wrapperlog " (arg-pp-main) pre: -L$dir" + argmatch=yes ;; ###################################################################### # Remove extraneous comma in "-Wl,-R,/dir" and in "-Wl,-L,/dir". |