OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

installer: disable incremental builds with XCC due to $XTENSA_SYSTEM 

In the future we should probably extract the array of XTENSA_SYSTEM
values out of xtensa-build-all.sh

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2021-03-03 20:48:49 -08:00 committed by Liam Girdwood
parent 6807ebce29
commit 25fc45143b
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
installer/GNUmakefile
View File

@ -131,14 +131,21 @@ BUILD_SOF_RIS := \
${SIGNED_list:%=${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri} ${SIGNED_list:%=${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri}
# The build is not deterministic; use this to reduce noise when testing # The build is not deterministic; use this to reduce noise when testing
# this Makefile # this Makefile.
# Also very useful with XCC, see next comment.
ifneq (true,${BUILD_ONLY_ONCE}) ifneq (true,${BUILD_ONLY_ONCE})
.PHONY: ${BUILD_SOF_RIS} .PHONY: ${BUILD_SOF_RIS}
endif endif
# Incremental builds are not possible with XCC because the entire
# toolchain requires $XTENSA_SYSTEM but CMake does not support
# build-time environment variables. In the future we could move the
# XTENSA_SYSTEM values out of xtensa-build-all.sh and into some shared
# config file included here.
${BUILD_SOF_RIS}: ${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri: | ${BUILDS_ROOT} ${BUILD_SOF_RIS}: ${BUILDS_ROOT}/build_%_${TOOLCHAIN}/sof.ri: | ${BUILDS_ROOT}
cd ${BUILDS_ROOT} && bdir="$$(dirname $@)" && \ cd ${BUILDS_ROOT} && bdir="$$(dirname $@)" && \
if test -d $${bdir}; then cmake --build $${bdir} -- sof; else \ if [ -d $${bdir} ] && [ xcc != "${TOOLCHAIN}" ] ; then \
cmake --build $${bdir} -- sof; else \
$(CURDIR)/../scripts/xtensa-build-all.sh $*; fi $(CURDIR)/../scripts/xtensa-build-all.sh $*; fi