diff options
| author | jlam <jlam> | 2004-09-26 21:38:03 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-09-26 21:38:03 +0000 |
| commit | 9e8fe3fc1f93e625731d040120d853d13184433d (patch) | |
| tree | f9fc9d85009ff79b6577d68782f4477205fecdba | |
| parent | cecd1d9807392da2b1099b3c733e2ffb72bc8058 (diff) | |
| download | pkgsrc-9e8fe3fc1f93e625731d040120d853d13184433d.tar.gz | |
Make _WRAPPEES into a public variable so that we can more easily create
wrapper scripts in package-land.
| -rw-r--r-- | lang/gcc3/Makefile.common | 4 | ||||
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common index bebc9d58287..0e13a93ae23 100644 --- a/lang/gcc3/Makefile.common +++ b/lang/gcc3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/09/21 15:04:34 jlam Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/09/26 21:38:03 jlam Exp $ GCC_VERSION= 3.3.4 DISTNAME= gcc-${GCC_VERSION} @@ -120,7 +120,7 @@ GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc-lib/${GCC_PLATFORM}/${GCC_VERSION} GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} .if defined(INSTLIBS) -_WRAPPEES+= LIBTOOL +WRAPPEES+= LIBTOOL .PHONY: scrub-libtool-archives post-build: scrub-libtool-archives diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 977b9fee07e..6a4dcf3944b 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.3 2004/09/25 20:38:21 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.4 2004/09/26 21:38:03 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -131,20 +131,24 @@ WRAPPER_VARS+= _WRAP_PATH # _WRAP_ALIASES.CC, _WRAP_ALIASES.LD, etc. are the other names by # which each wrapper may be invoked. # -_WRAPPEES+= AS -_WRAPPEES+= CC +WRAPPEES+= AS +WRAPPEES+= CC # XXX The following is a workaround until I can find time to fix this # XXX more completely (jlam). .if ${CPP:N-*} != ${CC} -_WRAPPEES+= CPP +WRAPPEES+= CPP .endif -_WRAPPEES+= CXX -_WRAPPEES+= FC +WRAPPEES+= CXX +WRAPPEES+= FC .if defined(USE_X11) IMAKE?= ${X11BASE}/bin/imake -_WRAPPEES+= IMAKE +WRAPPEES+= IMAKE .endif -_WRAPPEES+= LD +WRAPPEES+= LD + +.for _wrappee_ in ${WRAPPEES} +_WRAPPEES+= ${_wrappee_} +.endfor _WRAP_ALIASES.AS= as _WRAP_ALIASES.CC= cc gcc |