summaryrefslogtreecommitdiff
path: root/editors/xemacs/files
diff options
context:
space:
mode:
authorhasso <hasso>2009-04-30 17:22:06 +0000
committerhasso <hasso>2009-04-30 17:22:06 +0000
commit6abd5e83708f4682881ecb607c136477adf1f9d3 (patch)
tree4fde1e8b0997eb95236532bb79fb3e64c6f184cf /editors/xemacs/files
parentb89d803a4494643b2d1602038bad0543713480e3 (diff)
downloadpkgsrc-6abd5e83708f4682881ecb607c136477adf1f9d3.tar.gz
Make it build on DragonFly master.
Diffstat (limited to 'editors/xemacs/files')
-rw-r--r--editors/xemacs/files/dragonfly.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/editors/xemacs/files/dragonfly.h b/editors/xemacs/files/dragonfly.h
index 50f001d3c57..c89f49609b2 100644
--- a/editors/xemacs/files/dragonfly.h
+++ b/editors/xemacs/files/dragonfly.h
@@ -34,19 +34,12 @@
#endif
#define LD_SWITCH_SYSTEM
-#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 UNEXEC "unexelf.o"