Date: Tue, 12 Mar 2013 16:02:03 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 222816 for review Message-ID: <201303121602.r2CG23Tv072626@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@222816?ac=10 Change 222816 by brooks@brooks_zenith on 2013/03/12 16:02:03 Explicitly match source extension so that the various lists of TESLA intermediate products don't include C++ files which are then added to CLEANFILES and deleted. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#6 (text+ko) ==== @@ -92,10 +92,19 @@ .endif # !defined(SRCS) -TESLA_FILES= ${SRCS:.c=.tesla} -OLLS= ${SRCS:.c=.oll} -INSTRLLS= ${SRCS:.c=.instrll} -INSTROBJS= ${SRCS:.c=.instro} +# XXX: forced assignment due to make not figuring out how to make things +# from generated .c files (which are added to SRCS later). +CSRC_OBJS:= ${SRCS:M*.c:R:S/$/.object/:N.object} +CXXSRC_OBJS:= ${SRCS:M*.cc:R:S/$/.object/:N.object} \ + ${SRCS:M*.cpp:R:S/$/.object/:N.object} \ + ${SRCS:M*.cxx:R:S/$/.object/:N.object} \ + ${SRCS:M*.C:R:S/$/.object/:N.object} +SRC_OBJS= ${CSRC_OBJS} ${CXX_OBJS} + +TESLA_FILES= ${CSRC_OBJS:.object=.tesla} +OLLS= ${CSRC_OBJS:.object=.oll} +INSTRLLS= ${CSRC_OBJS:.object=.instrll} +INSTROBJS= ${CSRC_OBJS:.object=.instro} CLEANFILES+= ${TESLA_FILES} tesla.manifest ${OLLS} ${INSTRLLS} ${INSTROBJS} \ ${PROG}.instrumented @@ -108,10 +117,7 @@ ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${INSTROBJS} ${LDADD} -ltesla .if defined(LLVM_IR) && !defined(NO_LLVM_IR) -LOBJS:= ${SRCS:M*.[Cc]:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cc:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cpp:R:S/$/.obc/:N.obc} \ - ${SRCS:M*.cxx:R:S/$/.obc/:N.obc} +LOBJS:= ${SRC_OBJS:.object=.obc} CLEANFILES+= ${PROG}.bc ${LOBJS} .if !empty(LOBJS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303121602.r2CG23Tv072626>