diff options
| author | shannonjr <shannonjr@pkgsrc.org> | 2004-07-01 08:18:07 +0000 |
|---|---|---|
| committer | shannonjr <shannonjr@pkgsrc.org> | 2004-07-01 08:18:07 +0000 |
| commit | fa3ec7c8c7b8a86e14d5f7047efa729344adb346 (patch) | |
| tree | 3b604980a7ab4a29a3544c180d0d34d0051df066 | |
| parent | 98eaa37af0b6d35864d84c03acfb5517885e099d (diff) | |
| download | pkgsrc-fa3ec7c8c7b8a86e14d5f7047efa729344adb346.tar.gz | |
Modified buildlink3.mk to check for the existance of
${BUILDLINK_PREFIX.gcc34}/bin/gcc before calling it.
| -rw-r--r-- | lang/gcc34/buildlink3.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index 7ce4a80c7e0..278deaab2ca 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -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 @@ BUILDLINK_PACKAGES+= gcc34 .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 +. endif BUILDLINK_INCDIRS.gcc34+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include +. endif . endif .endif # GCC34_BUILDLINK3_MK |