Date: Sun, 30 Nov 2014 18:42:29 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275338 - in projects/bmake/lib/csu: . amd64 i386-elf Message-ID: <201411301842.sAUIgTp1019021@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.prog.mk> +.include <bsd.lib.mk> 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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411301842.sAUIgTp1019021>