diff options
| author | dinoex <dinoex@FreeBSD.org> | 2010-04-02 11:30:05 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2010-04-02 11:30:05 +0800 |
| commit | ff921a82ffbe8493a225cb8903a760995fc95527 (patch) | |
| tree | 466338ee29deba0c0e382fa4b50497b905748051 /Mk/bsd.gnustep.mk | |
| parent | 39a2142777282864211ddba6f66ac9fa651d2c1a (diff) | |
| download | freebsd-ports-gnome-ff921a82ffbe8493a225cb8903a760995fc95527.tar.gz freebsd-ports-gnome-ff921a82ffbe8493a225cb8903a760995fc95527.tar.zst freebsd-ports-gnome-ff921a82ffbe8493a225cb8903a760995fc95527.zip | |
- drop options GNUSTEP_WITH_GCC43, GNUSTEP_WITH_GCC44
objc has been removed from this ports.
- fallback to GNUSTEP_WITH_GCC34 on archs other then i386 and am64
Diffstat (limited to 'Mk/bsd.gnustep.mk')
| -rw-r--r-- | Mk/bsd.gnustep.mk | 25 |
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 |