Skip to content
Snippets Groups Projects
Commit 250b086e authored by Lluís Vilanova's avatar Lluís Vilanova Committed by Blue Swirl
Browse files

build: Include config-host.mak as soon as possible


Current code depends on variables defined in config-host.mak before it is
actually included.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Cc: Paul Brook <paul@codesourcery.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 00e94dbc
No related branches found
No related tags found
No related merge requests found
...@@ -3,13 +3,7 @@ ...@@ -3,13 +3,7 @@
# Always point to the root of the build tree (needs GNU make). # Always point to the root of the build tree (needs GNU make).
BUILD_DIR=$(CURDIR) BUILD_DIR=$(CURDIR)
GENERATED_HEADERS = config-host.h trace.h qemu-options.def # All following code might depend on configuration variables
ifeq ($(TRACE_BACKEND),dtrace)
GENERATED_HEADERS += trace-dtrace.h
endif
GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
ifneq ($(wildcard config-host.mak),) ifneq ($(wildcard config-host.mak),)
# Put the all: rule here so that config-host.mak can contain dependencies. # Put the all: rule here so that config-host.mak can contain dependencies.
all: build-all all: build-all
...@@ -24,6 +18,13 @@ config-host.mak: ...@@ -24,6 +18,13 @@ config-host.mak:
@exit 1 @exit 1
endif endif
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)
GENERATED_HEADERS += trace-dtrace.h
endif
GENERATED_HEADERS += qmp-commands.h qapi-types.h qapi-visit.h
GENERATED_SOURCES += qmp-marshal.c qapi-types.c qapi-visit.c
# Don't try to regenerate Makefile or configure # Don't try to regenerate Makefile or configure
# We don't generate any of them # We don't generate any of them
Makefile: ; Makefile: ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment