Module Name: src
Committed By: pooka
Date: Mon Feb 9 22:44:34 UTC 2015
Modified Files:
src/lib/libc: Makefile
src/lib/libc/compat/arch/i386: Makefile.inc
src/lib/libc/compat/arch/x86_64: Makefile.inc
Log Message:
Include compat in rumprun libc
Not including non-renamed symbols in libc caused all kinds of configure
scripts to do the wrong thing when they just tested linkage without
including headers. So, go for the "least moving parts" bandaid for now.
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/lib/libc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/arch/x86_64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.167 src/lib/libc/Makefile:1.168
--- src/lib/libc/Makefile:1.167 Wed Dec 10 00:37:30 2014
+++ src/lib/libc/Makefile Mon Feb 9 22:44:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2014/12/10 00:37:30 pooka Exp $
+# $NetBSD: Makefile,v 1.168 2015/02/09 22:44:34 pooka Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -41,7 +41,6 @@ assym.h: ${ARCHDIR}/genassym.cf
mv -f assym.h.tmp assym.h
.endif
-.if ${RUMPRUN} != "yes"
# The following controls how to build compatibility code for old NetBSD
# binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
# we include the code in libc.
@@ -55,7 +54,6 @@ COMPATDIR=${.CURDIR}/compat
# Marker for compat code that can't be easily isolated
CPPFLAGS+= -D__BUILD_LEGACY
.endif
-.endif
.include "${.CURDIR}/../../common/lib/libc/Makefile.inc"
.include "${.CURDIR}/atomic/Makefile.inc"
Index: src/lib/libc/compat/arch/i386/Makefile.inc
diff -u src/lib/libc/compat/arch/i386/Makefile.inc:1.2 src/lib/libc/compat/arch/i386/Makefile.inc:1.3
--- src/lib/libc/compat/arch/i386/Makefile.inc:1.2 Sat Mar 11 23:04:03 2006
+++ src/lib/libc/compat/arch/i386/Makefile.inc Mon Feb 9 22:44:34 2015
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2006/03/11 23:04:03 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2015/02/09 22:44:34 pooka Exp $
.include "${COMPATARCHDIR}/gen/Makefile.inc"
+.if ${RUMPRUN} != "yes"
.include "${COMPATARCHDIR}/sys/Makefile.inc"
+.endif
Index: src/lib/libc/compat/arch/x86_64/Makefile.inc
diff -u src/lib/libc/compat/arch/x86_64/Makefile.inc:1.4 src/lib/libc/compat/arch/x86_64/Makefile.inc:1.5
--- src/lib/libc/compat/arch/x86_64/Makefile.inc:1.4 Mon Jul 3 13:13:53 2006
+++ src/lib/libc/compat/arch/x86_64/Makefile.inc Mon Feb 9 22:44:34 2015
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 2006/07/03 13:13:53 drochner Exp $
+# $NetBSD: Makefile.inc,v 1.5 2015/02/09 22:44:34 pooka Exp $
.include "${COMPATARCHDIR}/gen/Makefile.inc"
+.if ${RUMPRUN} != "yes"
.include "${COMPATARCHDIR}/sys/Makefile.inc"
+.endif
