Date: Wed, 30 Oct 2013 19:39:32 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1187664 for review Message-ID: <201310301939.r9UJdWtU036293@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1187664?ac=10 Change 1187664 by brooks@brooks_zenith on 2013/10/30 19:38:49 Look forward to the bright day when SOAAP is something you install as a FreeBSD package and change to using SOAAP_INCLUDE_DIR and SOAAP_LIB_DIR instead of SOAAP_SOURCE_DIR/include and SOAAP_BUILD_DIR. Support but warn about the old values. Produce a helpful-ish error instead of a messy clang error when SOAAP_INCLUDE_DIR or SOAAP_LIB_DIR aren't set and can't be set via the deprecated variables. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#15 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#18 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.own.mk#15 (text+ko) ==== @@ -647,7 +647,23 @@ .endif .if ${MK_SOAAP} != "no" -CFLAGS+= -DSOAAP -I${SOAAP_SOURCE_DIR}/include +.if !defined(SOAAP_INCLUDE_DIR) +.if !defined(SOAAP_SOURCE_DIR) +.error Must set one of SOAAP_INCLUDE_DIR or SOAAP_SOURCE_DIR with WITH_SOAAP +.else +.warning SOAAP_SOURCE_DIR is deprecated, use SOAAP_INCLUDE_DIR +SOAAP_INCLUDE_DIR=${SOAAP_SOURCE_DIR}/include +.endif +.endif +.if !defined(SOAAP_LIB_DIR) +.if !defined(SOAAP_BUILD_DIR) +.error Must set one of SOAAP_LIB_DIR or SOAAP_BUILD_DIR with WITH_SOAAP +.else +.warning SOAAP_BUILD_DIR is deprecated, use SOAAP_LIB_DIR +SOAAP_LIB_DIR=${SOAAP_BUILD_DIR} +.endif +.endif +CFLAGS+= -DSOAAP -I${SOAAP_INCLUDE_DIR} .if defined(WITHOUT_LLVM_INSTRUMENTED) .error WITHOUT_LLVM_INSTRUMENTED and WITH_SOAAP can't both be set. .else ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#18 (text+ko) ==== @@ -298,22 +298,22 @@ .endif .${LLVM_IR_TYPE}-a.soaap: - ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \ + ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap ${SOAAP_FLAGS} \ -o /dev/null ${.IMPSRC} .${LLVM_IR_TYPE}-a.bc_cep: - ${OPT} -load ${SOAAP_BUILD_DIR}/libcep.so -insert-call-edge-profiling \ + ${OPT} -load ${SOAAP_LIB_DIR}/libcep.so -insert-call-edge-profiling \ -o ${.TARGET} ${.IMPSRC} .bc_cep.po_cep: ${LLC} -filetype=obj ${LLCFLAGS} -o ${.TARGET} ${.IMPSRC} .po_cep.soaap_cg: - ${CC} ${.IMPSRC} -L${SOAAP_BUILD_DIR} -L${LLVM_BUILD_DIR}/lib \ + ${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \ -lcep_rt -lprofile_rt ${LDADD} -o ${.TARGET} .${LLVM_IR_TYPE}-a.bc_soaap_perf: - ${OPT} -load ${SOAAP_BUILD_DIR}/libsoaap.so -soaap \ + ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \ -soaap-emulate-performance ${SOAAP_FLAGS} -o ${.TARGET} ${.IMPSRC} .bc_soaap_perf.po_soaap_perf:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310301939.r9UJdWtU036293>