Simpler version of the "make this work on 5-CURRENT again" fix.

In this version we simply use the default emulation rather than explicitly
setting it [wrong].
This commit is contained in:
David E. O'Brien 2003-04-28 15:37:22 +00:00
parent 85c4be58f2
commit 96202fca8f
2 changed files with 10 additions and 6 deletions

View file

@ -47,11 +47,6 @@ pre-patch:
@${MV} ${WRKSRC}/config/i386/freebsd.h ${WRKSRC}/config/i386/freebsd-aout.h
@${MV} ${WRKSRC}/config/i386/freebsd-elf.h ${WRKSRC}/config/i386/freebsd.h
post-patch:
.if ${OSVERSION} >= 500000
@${REINPLACE_CMD} -e 's|elf_i386|elf_i386_fbsd|' ${WRKSRC}/config/i386/freebsd.h
.endif
pre-configure:
@# Keep from running `autoconf' and `autoheader' since we modified
@# configure.in by patching it.

View file

@ -1,5 +1,5 @@
--- config/i386/freebsd.h.orig Fri Dec 5 04:15:34 1997
+++ config/i386/freebsd.h Sun Mar 21 17:59:06 1999
+++ config/i386/freebsd.h Sun Apr 27 15:12:42 2003
@@ -26,8 +26,18 @@
/* The svr4 ABI for the i386 says that records and unions are returned
@ -29,3 +29,12 @@
#undef CPP_SPEC
#define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
@@ -176,7 +186,7 @@
done. */
#undef LINK_SPEC
-#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
+#define LINK_SPEC "%{shared:-shared} \
%{!shared: \
%{!ibcs: \
%{!static: \