diff options
| author | dim <dim@FreeBSD.org> | 2015-03-21 19:20:15 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-03-21 19:20:15 +0000 |
| commit | 4c1f3918786ae4efc6cc624d0002f8ec83e4a523 (patch) | |
| tree | f2fe4d62ca358f6fb5769ebf1b1d02abf6643d82 /share | |
| parent | 48a0d48fb5a8382e19f93ab4c1faa34d06cfa1e7 (diff) | |
| download | FreeBSD-src-4c1f3918786ae4efc6cc624d0002f8ec83e4a523.zip FreeBSD-src-4c1f3918786ae4efc6cc624d0002f8ec83e4a523.tar.gz | |
MFC r279980:
Allow relative pathnames in SRCS, so as to enable building software
which includes more than one file with the same name, in different
directories.
For example, setting:
SRCS+= foo/foo.c bar/foo.c baz/foo.c
will now create separate objdirs 'foo', 'bar' and 'baz' for each of the
sources in the list, and use those objdirs for the corresponding object
files.
Reviewed by: brooks, imp
Differential Revision: https://reviews.freebsd.org/D1984
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.obj.mk | 10 | ||||
| -rw-r--r-- | share/mk/sys.mk | 15 |
2 files changed, 18 insertions, 7 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 634261e..a5e8e73 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -89,6 +89,16 @@ obj: .PHONY fi; \ ${ECHO} "${CANONICALOBJDIR} created for ${.CURDIR}"; \ fi +.for dir in ${SRCS:H:O:u} + @if ! test -d ${CANONICALOBJDIR}/${dir}/; then \ + mkdir -p ${CANONICALOBJDIR}/${dir}; \ + if ! test -d ${CANONICALOBJDIR}/${dir}/; then \ + ${ECHO} "Unable to create ${CANONICALOBJDIR}/${dir}."; \ + exit 1; \ + fi; \ + ${ECHO} "${CANONICALOBJDIR}/${dir} created for ${.CURDIR}"; \ + fi +.endfor .endif .if !target(objlink) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 05da24c..96cdc72 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -244,21 +244,21 @@ YFLAGS ?= -d ${CTFCONVERT_CMD} .c.o: - ${CC} ${CFLAGS} -c ${.IMPSRC} + ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .cc .cpp .cxx .C: ${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} .cc.o .cpp.o .cxx.o .C.o: - ${CXX} ${CXXFLAGS} -c ${.IMPSRC} + ${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} .m.o: - ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} + ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .p.o: - ${PC} ${PFLAGS} -c ${.IMPSRC} + ${PC} ${PFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .e .r .F .f: @@ -266,14 +266,15 @@ YFLAGS ?= -d -o ${.TARGET} .e.o .r.o .F.o .f.o: - ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC} + ${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} -c ${.IMPSRC} -o ${.TARGET} .S.o: - ${CC} ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} + ${CC} ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.o: - ${CC} -x assembler-with-cpp ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} + ${CC} -x assembler-with-cpp ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC} \ + -o ${.TARGET} ${CTFCONVERT_CMD} .s.o: |
