Peter Maydell <[email protected]> writes:
> On Tue, 2 Jul 2019 at 12:38, Markus Armbruster <[email protected]> wrote:
>>
>> The following changes since commit ab200dafc0e8a9925bb0ad0be478621f5f117c95:
>>
>> Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request'
>> into staging (2019-07-02 10:17:54 +0100)
>>
>> are available in the Git repository at:
>>
>> git://repo.or.cz/qemu/armbru.git tags/pull-build-2019-07-02
>>
>> for you to fetch changes up to b7f9b1b7fc9a00ab6e5f46555e87166533292576:
>>
>> Makefile: Reuse all's recursion machinery for clean and install
>> (2019-07-02 12:48:40 +0200)
>>
>> ----------------------------------------------------------------
>> Build system patches for 2019-07-02
>
> This seems to break the incremental builds (most hosts):
>
> make: Entering directory '/home/petmay01/qemu-for-merges/build/w64'
> make: *** No rule to make target 'subdir-slirp', needed by
> 'config-host.h'. Stop.
> make: *** Waiting for unfinished jobs....
> config-host.mak is out-of-date, running configure
> Install prefix c:/Program Files/QEMU
> [rest of configure output snipped; no other output]
PATCH 3 changes the dependency configure writes to config-host.h like
this:
if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then
- echo "config-host.h: subdir-slirp" >> $config_host_mak
+ echo "config-host.h: slirp/all" >> $config_host_mak
fi
For me, make complains, reruns configure (which adjusts the dependency),
then happily makes everything.
Hmm, I see. Without -k, make stops after rerunning configure.
Is that a problem?
