Skip to contentSkip to conversation

Build fixes

PATCH In review Juan Quintela 2 participants 4 messages Nov 5, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

v2 cover Build fixes

Hi

[v2]
Define GENERATED_HEADERS before include rules.mak
That makes dependencies work correctly.

[v1]

This series fixes the parallel build of qemu. I tried to get the best of Daniel and Stefan ideas with mine.
Once there fixed an obvious fix.

Daniel, can you check that parallel build also works for you? It works for me (TM). Stefan, what do you think?

It avoids the recursive call for serializing dependencies.
We still need to put direct dependencies for qemu-{img,nbd,io}.o of the headers I don't understand why the ones in rules.make are not enough.

Later, Juan.

Juan Quintela (2):
fix parallel build
fix type in CFLAGS name

 Makefile        |    8 +++++---
 Makefile.target |    6 ++++--
 rules.mak       |    4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)
#1 lore raw

PATCH v2 1/2 fix parallel build

Based on a ideas of Daniel Jacobowitz + Stefan Weil

---
 Makefile        |    8 +++++---
 Makefile.target |    6 ++++--
 rules.mak       |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
Makefile +5 -3
index c783aa4..4284358 100644
@@ -1,5 +1,8 @@
 # Makefile for QEMU.
 
+# This needs to be defined before rules.mak
+GENERATED_HEADERS = config-host.h config-all-devices.h
+
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
 all: build-all
@@ -40,8 +43,7 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
 
 -include config-all-devices.mak
 
-build-all: config-host.h config-all-devices.h $(DOCS) $(TOOLS)
-	$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) recurse-all,)
+build-all: $(DOCS) $(TOOLS) recurse-all
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
@@ -51,7 +53,7 @@ config-all-devices.h-timestamp: config-all-devices.mak
 
 SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
 
-subdir-%: config-host.h config-all-devices.h
+subdir-%: $(GENERATED_HEADERS)
 	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
 
 $(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
Makefile.target +4 -2
index fefd7ac..3cd89a1 100644
@@ -1,5 +1,8 @@
 # -*- Mode: makefile -*-
 
+# This needs to be defined before rules.mak
+GENERATED_HEADERS = config-target.h config-devices.h
+
 include ../config-host.mak
 include config-devices.mak
 include config-target.mak
@@ -33,8 +36,7 @@ config-target.h-timestamp: config-target.mak
 config-devices.h: config-devices.h-timestamp
 config-devices.h-timestamp: config-devices.mak
 
-all: config-target.h config-devices.h
-	$(call quiet-command, $(MAKE) $(PROGS),)
+all: $(PROGS)
 
 # Dummy command so that make thinks it has done something
 	@true
rules.mak +1 -1
index 5d7e8bb..4eb1f90 100644
@@ -13,7 +13,7 @@ MAKEFLAGS += -rR
 
 QEMU_CFLAGS += -MMD -MP -MT $@
 
-%.o: %.c
+%.o: %.c $(GENERATED_HEADERS)
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 
 %.o: %.S
Signature · 1 line
1.6.2.5
#2 lore raw

PATCH v2 2/2 fix type in CFLAGS name

In reply to Juan Quintela
---
 rules.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
rules.mak +1 -1
index 4eb1f90..f8e5b04 100644
@@ -17,7 +17,7 @@ QEMU_CFLAGS += -MMD -MP -MT $@
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  CC    $(TARGET_DIR)$@")
 
 %.o: %.S
-	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")
+	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  AS    $(TARGET_DIR)$@")
 
 %.o: %.m
 	$(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) -c -o $@ $<,"  OBJC  $(TARGET_DIR)$@")
Signature · 1 line
1.6.2.5
#3 lore raw
In reply to Juan Quintela
Quoted 1 line · Juan Quintela

Daniel, can you check that parallel build also works for you? It works for me (TM).

This version made it through two build cycles. I think it works.

Signature · 2 lines
Daniel Jacobowitz
CodeSourcery