NetBSD with native clang won't have libgcc, so fake a static library.

Avoids going to the great hacks in the build system to avoid it.

5 files changed, 50 insertions, 5 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 818c117f0a6..baf76212813 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2013/10/27 20:41:49 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2013/10/27 20:47:53 joerg Exp $
 
 DISTNAME=	emacs-20.7
 PKGNAME=	${DISTNAME:S/emacs/emacs20/}
@@ -58,6 +58,15 @@ CHECK_WRKREF_SKIP+=	bin/emacs-20.7
 LDFLAGS+=	-Wl,-z,nocombreloc
 .endif
 
+.if (${OPSYS} == "NetBSD") && \
+    !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
+# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
+pre-configure: fake-libgcc
+
+fake-libgcc:
+	${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
+.endif
+
 # NetBSD < 5.99.24 uses termcap; afterwards terminfo. Emacs needs to be told.
 .if (${OPSYS} == "NetBSD") && !exists(/usr/include/term.h)
 CPPFLAGS+=-D__NETBSD_USE_TERMCAP__
diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common
index 7032806985d..0ebe8940a91 100644
--- a/editors/emacs21/Makefile.common
+++ b/editors/emacs21/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2013/10/27 20:41:49 joerg Exp $
+# $NetBSD: Makefile.common,v 1.15 2013/10/27 20:47:53 joerg Exp $
 #
 # used by editors/emacs21/Makefile
 # used by editors/emacs21-nox11/Makefile
@@ -90,6 +90,15 @@ TRADCPP=	${CPP} -traditional-cpp
 .endif
 ALL_ENV+=	TRADCPP=${TRADCPP:Q}
 
+.if (${OPSYS} == "NetBSD") && \
+    !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
+# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
+pre-configure: fake-libgcc
+
+fake-libgcc:
+	${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
+.endif
+
 INFO_FILES=	yes
 REPLACE_PERL=	lib-src/grep-changelog
 
diff --git a/editors/emacs22/Makefile.common b/editors/emacs22/Makefile.common
index f6de642676a..bccfd2d0cbc 100644
--- a/editors/emacs22/Makefile.common
+++ b/editors/emacs22/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2013/04/08 11:17:12 rodent Exp $
+# $NetBSD: Makefile.common,v 1.5 2013/10/27 20:47:53 joerg Exp $
 #
 # used by editors/emacs22/Makefile
 # used by editors/emacs22-nox11/Makefile
@@ -67,6 +67,15 @@ CPP+=		-P
 CONFIGURE_ENV+=	CPP=${CPP:Q}
 .endif
 
+.if (${OPSYS} == "NetBSD") && \
+    !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
+# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
+pre-configure: fake-libgcc
+
+fake-libgcc:
+	${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
+.endif
+
 post-extract:
 	cp ${FILESDIR}/site-init.el ${WRKSRC}/lisp
 	cp ${FILESDIR}/dragonfly.h ${WRKSRC}/src/s
diff --git a/editors/emacs23/Makefile.common b/editors/emacs23/Makefile.common
index 5faa242cb16..02c44258b23 100644
--- a/editors/emacs23/Makefile.common
+++ b/editors/emacs23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2013/02/23 23:46:37 dholland Exp $
+# $NetBSD: Makefile.common,v 1.3 2013/10/27 20:47:53 joerg Exp $
 #
 # used by editors/emacs23/Makefile
 # used by editors/emacs23-nox11/Makefile
@@ -60,6 +60,15 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
 CFLAGS+=		-fno-pie
 .endif
 
+.if (${OPSYS} == "NetBSD") && \
+    !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
+# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
+pre-configure: fake-libgcc
+
+fake-libgcc:
+	${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
+.endif
+
 .if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
 CPPFLAGS+=	-DTERMINFO
 .elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"
diff --git a/editors/emacs24/Makefile.common b/editors/emacs24/Makefile.common
index 3ae7a0aea95..ae5f05f91a4 100644
--- a/editors/emacs24/Makefile.common
+++ b/editors/emacs24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2013/03/24 15:15:09 dholland Exp $
+# $NetBSD: Makefile.common,v 1.6 2013/10/27 20:47:53 joerg Exp $
 #
 # used by editors/emacs24/Makefile
 # used by editors/emacs24-nox11/Makefile
@@ -60,6 +60,15 @@ CHECK_WRKREF_SKIP+=	bin/emacs-${EMACS_VERSION}
 CFLAGS+=		-fno-pie
 .endif
 
+.if (${OPSYS} == "NetBSD") && \
+    !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a)
+# NetBSD with native Clang doesn't provide libgcc, everything is in libc.
+pre-configure: fake-libgcc
+
+fake-libgcc:
+	${AR} q ${BUILDLINK_DIR}/lib/libgcc.a
+.endif
+
 .if (${OPSYS} == "NetBSD") && exists(/usr/include/term.h)
 CPPFLAGS+=	-DTERMINFO
 .elif ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" || ${OPSYS} == "OpenBSD"