summaryrefslogtreecommitdiff
path: root/mk/compiler
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-05 01:28:20 +0000
committerjlam <jlam@pkgsrc.org>2004-02-05 01:28:20 +0000
commit4f87d407eae06b58abc3ae2207d1c80b5a2bdbe8 (patch)
tree6e59521183bc02e3367e42175e408a912b0174c5 /mk/compiler
parent3fd107d9b4336254c608eaa0ad130ae4d9013620 (diff)
downloadpkgsrc-4f87d407eae06b58abc3ae2207d1c80b5a2bdbe8.tar.gz
Reset the values of _GCC_PREFIX and _GCC_SUBPREFIX from the value of
_GCC_ARCHDIR, since _GCC_ARCHDIR is something that GCC actually tells us and can be relied upon to accurately give the installed location of GCC.
Diffstat (limited to 'mk/compiler')
-rw-r--r--mk/compiler/gcc.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 233d6eea33d..ddc4a464495 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.31 2004/02/04 23:25:13 jlam Exp $
+# $NetBSD: gcc.mk,v 1.32 2004/02/05 01:28:20 jlam Exp $
.if !defined(COMPILER_GCC_MK)
COMPILER_GCC_MK= defined
@@ -228,6 +228,10 @@ _GCC_ARCHDIR!= \
else \
${ECHO} "_GCC_ARCHDIR_not_found"; \
fi
+. if empty(_GCC_ARCHDIR:M*not_found*)
+_GCC_PREFIX:= ${_GCC_ARCHDIR:H:H:H:H}
+_GCC_SUBPREFIX:= ${_GCC_PREFIX:T}
+. endif
_GCC_LIBDIRS= ${_GCC_ARCHDIR} ${_GCC_PREFIX}lib
_GCC_LDFLAGS= # empty
. for _dir_ in ${_GCC_LIBDIRS:N*not_found*}