adbrucker
/
lh-l4v
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "cspec: fix make dependency breakage when CMake command fails" 

This reverts commit 1635696387.

Unconditionally cleaning and invoking the kernel build system turns out
to be a bad idea; it breaks when multiple builds are run in parallel.
This commit is contained in:
Japheth Lim 2018-04-13 16:40:35 +10:00
parent 1635696387
commit b264f59f8d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spec/cspec/c/Makefile
View File

@ -45,14 +45,16 @@ CSPEC_DIR=${PWD}/..
KERNEL_DEPS = $(shell find ${SOURCE_ROOT} -type f)
# Top level rule for rebuilding kernel_all.c_pp
${BUILDROOT}/kernel_all.c_pp: init_CMake
${BUILDROOT}/kernel_all.c_pp: ${BUILDROOT}/CMakeCache.txt
cd ${BUILDROOT} && ninja kernel_all_pp_wrapper
cp -a ${BUILDROOT}/kernel_all_pp.c $@
# Initialize the CMake build. CMake produces many build files, so rather than trying
# to list them as dependencies, we just re-run it every time. This keeps things simple
# and correct at the expense of some performance.
init_CMake: ${SOURCE_ROOT}/gcc.cmake ${SOURCE_ROOT}/configs/${CONFIG} ${KERNEL_DEPS} ${CONFIG_DOMAIN_SCHEDULE}
# Rule for initializing the CMake build. In order to pick up changes to the configuration
# we have to purge everything and start again, so for simplicity we just make the cache
# depend upon all the kernel sources. This is mostly needed as the usage of this 'hides' the
# fact there is a configured build going on, so we accept increased rebuild times to not
# confuse users by not rebuilding when we should
${BUILDROOT}/CMakeCache.txt: ${SOURCE_ROOT}/gcc.cmake ${SOURCE_ROOT}/configs/${CONFIG} ${KERNEL_DEPS} ${CONFIG_DOMAIN_SCHEDULE}
rm -rf ${BUILDROOT}
mkdir -p ${BUILDROOT}
cd ${BUILDROOT} && \
@ -75,4 +77,4 @@ clean:
rm -rf build
rm -f ${UMM_TYPES}
.PHONY: clean init_CMake
.PHONY: clean