pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/compiler If we can't find the package using pkg_inf...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/39ff7f476f56
branches:  trunk
changeset: 467537:39ff7f476f56
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Feb 02 12:44:22 2004 +0000

description:
If we can't find the package using pkg_info, then use a simple heuristic
to figure out _GCC_SUBPREFIX.

diffstat:

 mk/compiler/gcc.mk |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r cef4e1f1eb23 -r 39ff7f476f56 mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk        Mon Feb 02 12:27:12 2004 +0000
+++ b/mk/compiler/gcc.mk        Mon Feb 02 12:44:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.11 2004/02/02 12:27:12 jlam Exp $
+# $NetBSD: gcc.mk,v 1.12 2004/02/02 12:44:22 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=       defined
@@ -174,7 +174,15 @@
                ${GREP} "File:.*bin/gcc" |                              \
                ${SED} -e "s/.*File: *//;s/bin\/gcc.*//;q";             \
        else                                                            \
-               ${ECHO} "not_found/";                                   \
+               gccpath="`${TYPE} ${CC} | ${AWK} '{ print $$NF }'`";    \
+               case $$gccpath in                                       \
+               ${LOCALBASE}/*)                                         \
+                       ${ECHO} "`${BASENAME} $$gccpath`/";             \
+                       ;;                                              \
+               *)                                                      \
+                       ${ECHO} "not_found/";                           \
+                       ;;                                              \
+               esac
        fi
 _GCC_PREFIX=           ${LOCALBASE}/${_GCC_SUBPREFIX}
 _GCC_ARCHDIR!=         \



Home | Main Index | Thread Index | Old Index