summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2006-01-18 19:47:29 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2006-01-18 19:47:29 +0000
commit7ee6632493be02ade9846fc293e0fbef3f1879e9 (patch)
treeb1ea9f4875b9b818517c5400d0efe840ff3b3679
parent- Remove unneeded dependency on archetypes (diff)
- new default gcc34
- new options: GNUSTEP_WITH_GCC40 GNUSTEP_WITH_GCC41 GNUSTEP_WITH_GCC42
Notes
Notes: svn path=/head/; revision=153831
-rw-r--r--lang/gcc-objc/Makefile19
1 files changed, 18 insertions, 1 deletions
diff --git a/lang/gcc-objc/Makefile b/lang/gcc-objc/Makefile
index e6f8dd6dc2e8..7e2924024f3f 100644
--- a/lang/gcc-objc/Makefile
+++ b/lang/gcc-objc/Makefile
@@ -18,7 +18,9 @@ LDCONFIG_DIRS= ${TARGLIB}
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(GNUSTEP_WITH_GCC32) && !defined(GNUSTEP_WITH_GCC33) && !defined(GNUSTEP_WITH_GCC34)
-GNUSTEP_WITH_GCC33= yes
+.if !defined(GNUSTEP_WITH_GCC40) && !defined(GNUSTEP_WITH_GCC41) && !defined(GNUSTEP_WITH_GCC42)
+GNUSTEP_WITH_GCC34= yes
+.endif
.endif
.if defined(GNUSTEP_WITH_GCC32)
@@ -37,6 +39,21 @@ MASTERDIR?= ${.CURDIR}/../gcc34
CONFLICTS?= gcc-3.4*
COMMENT2= 3.4.x
.endif
+.if defined(GNUSTEP_WITH_GCC40)
+MASTERDIR?= ${.CURDIR}/../gcc40
+CONFLICTS?= gcc-4.0*
+COMMENT2= 4.0.x
+.endif
+.if defined(GNUSTEP_WITH_GCC41)
+MASTERDIR?= ${.CURDIR}/../gcc41
+CONFLICTS?= gcc-4.1*
+COMMENT2= 4.1.x
+.endif
+.if defined(GNUSTEP_WITH_GCC42)
+MASTERDIR?= ${.CURDIR}/../gcc42
+CONFLICTS?= gcc-4.2*
+COMMENT2= 4.2.x
+.endif
.if exists(${.CURDIR}/Makefile.local)
.include "${.CURDIR}/Makefile.local"