From owner-svn-src-projects@FreeBSD.ORG Sun Nov 30 18:42:30 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1DEE75F; Sun, 30 Nov 2014 18:42:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8380E315; Sun, 30 Nov 2014 18:42:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAUIgUO6019026; Sun, 30 Nov 2014 18:42:30 GMT (envelope-from sjg@FreeBSD.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAUIgTp1019021; Sun, 30 Nov 2014 18:42:29 GMT (envelope-from sjg@FreeBSD.org) Message-Id: <201411301842.sAUIgTp1019021@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org using -f From: "Simon J. Gerraty" Date: Sun, 30 Nov 2014 18:42:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275338 - in projects/bmake/lib/csu: . amd64 i386-elf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Nov 2014 18:42:30 -0000 Author: sjg Date: Sun Nov 30 18:42:29 2014 New Revision: 275338 URL: https://svnweb.freebsd.org/changeset/base/275338 Log: Put lib/csu/amd64/Makefile back the way it is in head and handle staging via ../Makefile.inc Modified: projects/bmake/lib/csu/Makefile.inc projects/bmake/lib/csu/amd64/Makefile projects/bmake/lib/csu/i386-elf/Makefile.depend Modified: projects/bmake/lib/csu/Makefile.inc ============================================================================== --- projects/bmake/lib/csu/Makefile.inc Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/Makefile.inc Sun Nov 30 18:42:29 2014 (r275338) @@ -7,3 +7,8 @@ SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/ NO_WMISSING_VARIABLE_DECLARATIONS= .include "../Makefile.inc" + +.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == "" +FILES?= ${OBJS} +FILESDIR?= ${LIBDIR} +.endif Modified: projects/bmake/lib/csu/amd64/Makefile ============================================================================== --- projects/bmake/lib/csu/amd64/Makefile Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/amd64/Makefile Sun Nov 30 18:42:29 2014 (r275338) @@ -9,12 +9,6 @@ CFLAGS+= -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include CFLAGS+= -fno-omit-frame-pointer -FILES= ${OBJS} -FILESOWN= ${LIBOWN} -FILESGRP= ${LIBGRP} -FILESMODE= ${LIBMODE} -FILESDIR= ${LIBDIR} - all: ${OBJS} CLEANFILES= ${OBJS} @@ -44,5 +38,8 @@ Scrt1.s: crt1.c Scrt1.o: Scrt1.s ${CC} ${ACFLAGS} -c -o ${.TARGET} Scrt1.s +realinstall: + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${OBJS} ${DESTDIR}${LIBDIR} -.include +.include Modified: projects/bmake/lib/csu/i386-elf/Makefile.depend ============================================================================== --- projects/bmake/lib/csu/i386-elf/Makefile.depend Sun Nov 30 17:29:49 2014 (r275337) +++ projects/bmake/lib/csu/i386-elf/Makefile.depend Sun Nov 30 18:42:29 2014 (r275338) @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \