diff options
| author | sjg <sjg@FreeBSD.org> | 2014-11-30 18:42:29 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2014-11-30 18:42:29 +0000 |
| commit | 5a7fe0500dbd8b7df2ac081e83ad33237c0fdec1 (patch) | |
| tree | 82ccbfe4c13d229d7110adade17365ffa89aa2f7 /lib | |
| parent | 6134059396b964f73e95c703fcf185861c0cbb57 (diff) | |
| download | FreeBSD-src-5a7fe0500dbd8b7df2ac081e83ad33237c0fdec1.zip FreeBSD-src-5a7fe0500dbd8b7df2ac081e83ad33237c0fdec1.tar.gz | |
Put lib/csu/amd64/Makefile back the way it is in head
and handle staging via ../Makefile.inc
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/csu/Makefile.inc | 5 | ||||
| -rw-r--r-- | lib/csu/amd64/Makefile | 11 | ||||
| -rw-r--r-- | lib/csu/i386-elf/Makefile.depend | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/csu/Makefile.inc b/lib/csu/Makefile.inc index 95d5c5e..ff77f66 100644 --- a/lib/csu/Makefile.inc +++ b/lib/csu/Makefile.inc @@ -7,3 +7,8 @@ SED_FIX_NOTE = -i "" -e '/\.note\.tag/s/progbits/note/' NO_WMISSING_VARIABLE_DECLARATIONS= .include "../Makefile.inc" + +.if ${MK_STAGING} == "yes" && ${.TARGETS:Nall} == "" +FILES?= ${OBJS} +FILESDIR?= ${LIBDIR} +.endif diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index 5ddbab6..80d14a7 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -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> diff --git a/lib/csu/i386-elf/Makefile.depend b/lib/csu/i386-elf/Makefile.depend index ff699f7..7d982eb 100644 --- a/lib/csu/i386-elf/Makefile.depend +++ b/lib/csu/i386-elf/Makefile.depend @@ -2,8 +2,6 @@ DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,} -DEP_MACHINE := ${.PARSEFILE:E} - DIRDEPS = \ include \ |
