diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-09 03:26:39 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-09 03:26:39 +0000 |
| commit | d420fe7358d37e777d120694013748ef719b277e (patch) | |
| tree | 3a41265a10e67317ecbf8a2ac456dcab116e14f5 /editors | |
| parent | 46728682bfb9996d6b05cc48e269f47cd1390636 (diff) | |
| download | pkgsrc-d420fe7358d37e777d120694013748ef719b277e.tar.gz | |
CC_VERSION is "gcc-2.8.1" for egcs. Also fix up a few nits: not all
compilers understand "-O" to optimize, and if we only care about gcc, then
wrap the block in an ifdef that is triggered only if we're using gcc.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/lyx-qt/Makefile.common | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 6b8295efaf3..2b19758d778 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.13 2004/02/09 03:26:39 jlam Exp $ # DISTNAME= lyx-1.3.3 @@ -39,20 +39,22 @@ CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ .include "../../mk/bsd.prefs.mk" # XXX these values are taken from the LyX configure script -.if defined(CC_VERSION) -. if !empty(CC_VERSION:Mgcc-2.95.1) -CXXFLAGS+= -fpermissive -ftemplate-depth-30 +.if !empty(CC_VERSION:Mgcc-*) +. if !empty(CC_VERSION:Mgcc-2.8*) +CXXFLAGS+= # empty +. elif !empty(CC_VERSION:Mgcc-2.95.1) +CXXFLAGS+= -fpermissive -ftemplate-depth-30 . elif !empty(CC_VERSION:Mgcc-2.95.*) -CXXFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 +CXXFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 . elif !empty(CC_VERSION:Mgcc-2.96*) # some Linux distros -CXXFLAGS+= -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend +CXXFLAGS+= -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend . elif !empty(CC_VERSION:Mgcc-3.0*) -# no op +CXXFLAGS+= # empty . elif !empty(CC_VERSION:Mgcc-3.1*) -CXXFLAGS+= -finline-limit=500 -fno-exceptions +CXXFLAGS+= -finline-limit=500 -fno-exceptions . else # >= 3.2 -CXXFLAGS+= -fno-exceptions +CXXFLAGS+= -fno-exceptions . endif .endif |