pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/gcc34 Modified buildlink3.mk to check for the exi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/20dbd4b2d8c1
branches:  trunk
changeset: 477376:20dbd4b2d8c1
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Thu Jul 01 08:18:07 2004 +0000

description:
Modified buildlink3.mk to check for the existance of
${BUILDLINK_PREFIX.gcc34}/bin/gcc before calling it.

diffstat:

 lang/gcc34/buildlink3.mk |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 46e79594ebf3 -r 20dbd4b2d8c1 lang/gcc34/buildlink3.mk
--- a/lang/gcc34/buildlink3.mk  Thu Jul 01 07:37:11 2004 +0000
+++ b/lang/gcc34/buildlink3.mk  Thu Jul 01 08:18:07 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/29 18:01:24 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/07/01 08:18:07 shannonjr Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
@@ -14,17 +14,19 @@
 .if !empty(GCC34_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gcc34+=      gcc34>=3.4.1
 BUILDLINK_PKGSRCDIR.gcc34?=    ../../lang/gcc34
+.  if exists(${BUILDLINK_PREFIX.gcc34}/bin/gcc)
 _GNAT1!=${BUILDLINK_PREFIX.gcc34}/bin/gcc -print-prog-name=gnat1
-.  if exists(${_GNAT1})
+.    if exists(${_GNAT1})
 BUILDLINK_ENV+=        ADAC=${BUILDLINK_PREFIX.gcc34}/bin/gcc
-.  endif
+.    endif
 _GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc34}/bin/gcc --print-libgcc-file-name`
-.  if empty(_GCC_ARCHDIR:M*not_found*)
+.    if empty(_GCC_ARCHDIR:M*not_found*)
 BUILDLINK_LIBDIRS.gcc34+=      lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/
-.    if exists(${_GNAT1})
+.      if exists(${_GNAT1})
 BUILDLINK_LIBDIRS.gcc34+=      ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adalib
+.      endif
+BUILDLINK_INCDIRS.gcc34+=      include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include
 .    endif
-BUILDLINK_INCDIRS.gcc34+=      include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include
 .  endif
 .endif  # GCC34_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index