diff options
Diffstat (limited to 'editors/emacs20')
| -rw-r--r-- | editors/emacs20/Makefile | 6 | ||||
| -rw-r--r-- | editors/emacs20/files/dragonfly.h | 15 |
2 files changed, 7 insertions, 14 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 8d59aae906d..5f7b39b2b4a 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2008/11/10 17:21:34 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2009/04/30 17:22:06 hasso Exp $ DISTNAME= emacs-20.7 PKGREVISION= 12 @@ -51,8 +51,8 @@ CHECK_WRKREF_SKIP+= bin/emacs-20.7 LDFLAGS+= -Wl,-z,nocombreloc .endif -.if ${OPSYS} == "DragonFly" && exists(/usr/lib/crtbegin.o) -CPPFLAGS+= -DDFLY_PRE_17_CRT +.if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) +CPPFLAGS+= -DDFLY_CRT_USRLIB .endif .include "options.mk" diff --git a/editors/emacs20/files/dragonfly.h b/editors/emacs20/files/dragonfly.h index d79c107993a..5592cc5e15d 100644 --- a/editors/emacs20/files/dragonfly.h +++ b/editors/emacs20/files/dragonfly.h @@ -41,19 +41,12 @@ Boston, MA 02111-1307, USA. */ #undef BSD_PGRPS #define GETPGRP_NO_ARG -#if defined(__GNUC__) && __GNUC__ == 3 && __GNUC_MINOR__ == 4 -# ifndef DFLY_PRE_17_CRT -#define START_FILES pre-crt0.o /usr/lib/gcc34/crt1.o /usr/lib/gcc34/crti.o /usr/lib/gcc34/crtbegin.o -#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/gcc34/crtend.o /usr/lib/gcc34/crtn.o -# else -#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o -#define LIB_STANDARD -L/usr/lib/gcc34 -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o -# endif -#elif defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 1 +#ifdef DFLY_CRT_USRLIB +#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/gcc41/crtbegin.o +#define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/crtn.o +#else #define START_FILES pre-crt0.o /usr/lib/gcc41/crt1.o /usr/lib/gcc41/crti.o /usr/lib/gcc41/crtbegin.o #define LIB_STANDARD -L/usr/lib/gcc41 -lgcc -lc -lgcc /usr/lib/gcc41/crtend.o /usr/lib/gcc41/crtn.o -#else -#error "Add compiler version magic" #endif #define LD_SWITCH_SYSTEM_1 |