aboutsummaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2010-04-02 03:30:05 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2010-04-02 03:30:05 +0000
commit35d0e02255ba40fc52f22604c69ab4a2e8ce48a0 (patch)
tree5b168c750bc5fc47da32c223017b21b118f9464e /Mk
parent526d4e9e92d6a1b874aea57d0692dda3fe0ee423 (diff)
downloadports-35d0e02255ba40fc52f22604c69ab4a2e8ce48a0.tar.gz
ports-35d0e02255ba40fc52f22604c69ab4a2e8ce48a0.zip
Notes
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnustep.mk25
1 files changed, 9 insertions, 16 deletions
diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index ff6e760dc46a..2a5dc6572d6c 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -29,12 +29,6 @@
# GNUSTEP_WITH_GCC42=yes
# use gcc 4.2.x with objective C shared libraries (default).
#
-# GNUSTEP_WITH_GCC43=yes
-# use gcc 4.2.x with objective C shared libraries.
-#
-# GNUSTEP_WITH_GCC44=yes
-# use gcc 4.2.x with objective C shared libraries.
-#
#
# Options for a port before include this file:
# ============================================
@@ -218,10 +212,15 @@ PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
.if !defined(GNUSTEP_WITH_BASE_GCC)
.if !defined(GNUSTEP_WITH_GCC34)
-.if !defined(GNUSTEP_WITH_GCC42) && !defined(GNUSTEP_WITH_GCC43) && !defined(GNUSTEP_WITH_GCC44)
+.if !defined(GNUSTEP_WITH_GCC42)
+.if ${ARCH} == i386 || ${ARCH} == amd64
GNUSTEP_WITH_GCC42= yes
-.endif
-.endif
+.else
+# alpha ia64 powerpc arm sparc64 sun4v
+GNUSTEP_WITH_GCC34= yes
+.endif # ARCH
+.endif # GNUSTEP_WITH_GCC42
+.endif # GNUSTEP_WITH_GCC34
.if defined(GNUSTEP_WITH_GCC34)
GCCSUFFIX=34
@@ -229,17 +228,11 @@ GCCSUFFIX=34
.if defined(GNUSTEP_WITH_GCC42)
GCCSUFFIX=42
.endif
-.if defined(GNUSTEP_WITH_GCC43)
-GCCSUFFIX=43
-.endif
-.if defined(GNUSTEP_WITH_GCC44)
-GCCSUFFIX=44
-.endif
CC= gcc${GCCSUFFIX}
CXX= g++${GCCSUFFIX}
GNUSTEP_GCC_PORT?= lang/gcc${GCCSUFFIX}
-.endif
+.endif # GNUSTEP_WITH_BASE_GCC
# ---------------------------------------------------------------------------
# using base