diff options
| author | gavan <gavan@pkgsrc.org> | 2003-09-23 19:19:33 +0000 |
|---|---|---|
| committer | gavan <gavan@pkgsrc.org> | 2003-09-23 19:19:33 +0000 |
| commit | fbb3e814f9a34290449676683e704824dc6a3b71 (patch) | |
| tree | 06d62a0767176105275f7a4a635fbb9b3dbafe58 /mk/compiler.mk | |
| parent | f9325894227a0fe7f46c53d017c17a230dbe8da3 (diff) | |
| download | pkgsrc-fbb3e814f9a34290449676683e704824dc6a3b71.tar.gz | |
Work out _GCC_ARCHSUBDIR correctly, using the method from
lang/gcc3/buildlink2.mk
Diffstat (limited to 'mk/compiler.mk')
| -rw-r--r-- | mk/compiler.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mk/compiler.mk b/mk/compiler.mk index 5d4199c9df5..2f47ba9525f 100644 --- a/mk/compiler.mk +++ b/mk/compiler.mk @@ -1,4 +1,4 @@ -# $NetBSD: compiler.mk,v 1.9 2003/09/21 16:43:47 wiz Exp $ +# $NetBSD: compiler.mk,v 1.10 2003/09/23 19:19:33 gavan Exp $ # This Makefile fragment implements handling for supported # C/C++/fortran compilers. @@ -110,7 +110,15 @@ GCC_REQD= 2.95.3 # we need to define these early, as they are used by gcc/buildlink2.mk. _GCC_SUBPREFIX= gcc-2.95.3/ _GCC_ARCHDIR= ${_GCC_PREFIX}${_GCC_ARCHSUBDIR} -_GCC_ARCHSUBDIR= lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3 +_GCC_PREFIX= ${LOCALBASE}/${_GCC_SUBPREFIX} +_GCC_LIBGCCDIR!= \ + if [ -x ${_GCC_PREFIX}bin/gcc ]; then \ + dirname `${_GCC_PREFIX}bin/gcc --print-libgcc-file-name`; \ + else \ + ${ECHO} not-defined; \ + fi +_GCC_ARCHSUBDIR= \ + ${_GCC_LIBGCCDIR:S|^${BUILDLINK_PREFIX.gcc}/${_GCC_SUBPREFIX}||} . if empty(USE_BUILDLINK2:M[nN][oO]) . include "../lang/gcc/buildlink2.mk" |