Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/lib/libkern Do not include compiler-rt in librump. libr...



details:   https://anonhg.NetBSD.org/src/rev/800324b8244b
branches:  trunk
changeset: 327588:800324b8244b
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 12 00:22:53 2014 +0000

description:
Do not include compiler-rt in librump.  librump is not a toolchain support
library, and toolchain support belongs in the host libc or libgcc or
equivalent entity that is actually supposed to complement the toolchain.

Fixes librump build on (a) Linux ARM (collisions with libgcc)

diffstat:

 sys/lib/libkern/Makefile.libkern |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r aed61aeccd7b -r 800324b8244b sys/lib/libkern/Makefile.libkern
--- a/sys/lib/libkern/Makefile.libkern  Wed Mar 12 00:07:33 2014 +0000
+++ b/sys/lib/libkern/Makefile.libkern  Wed Mar 12 00:22:53 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libkern,v 1.31 2014/01/29 23:37:18 joerg Exp $
+#      $NetBSD: Makefile.libkern,v 1.32 2014/03/12 00:22:53 pooka Exp $
 
 # 
 # Variable definitions for libkern.  
@@ -43,7 +43,9 @@
 .include "$M/Makefile.inc"
 .endif
 
+.if !defined(RUMPKERNEL)
 .include ".${PARSEDIR}/Makefile.compiler-rt"
+.endif
 
 # Other stuff
 SRCS+= kern_assert.c __main.c



Home | Main Index | Thread Index | Old Index