diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-22 14:07:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-22 14:07:39 +0100 |
| commit | ddb45afbfbc639365d6c934e4e29f6de5e5e2a0e (patch) | |
| tree | 70ec794339c83595888e300972cce1b51f108ca5 | |
| parent | a3e3b5217b35424e8c28c573a425c5e5c9b4f59d (diff) | |
contrib/elf2dmp: Build download.o with CURL_CFLAGSpull-target-arm-20190722
contrib/elf2dmp has a source file which uses curl/curl.h;
although we link the final executable with CURL_LIBS, we
forgot to build this source file with CURL_CFLAGS, so if
the curl header is in a place that's not already on the
system include path then it will fail to build.
Add a line specifying the cflags needed for download.o;
while we are here, bring the specification of the libs
into line with this, since using a per-object variable
setting is preferred over adding them to the final
executable link line.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20190719100955.17180-1-peter.maydell@linaro.org
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | contrib/elf2dmp/Makefile.objs | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -626,7 +626,6 @@ ifneq ($(EXESUF),) qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) endif -elf2dmp$(EXESUF): LIBS += $(CURL_LIBS) elf2dmp$(EXESUF): $(elf2dmp-obj-y) $(call LINK, $^) diff --git a/contrib/elf2dmp/Makefile.objs b/contrib/elf2dmp/Makefile.objs index e3140f58cf..1505716916 100644 --- a/contrib/elf2dmp/Makefile.objs +++ b/contrib/elf2dmp/Makefile.objs @@ -1 +1,4 @@ elf2dmp-obj-y = main.o addrspace.o download.o pdb.o qemu_elf.o + +download.o-cflags := $(CURL_CFLAGS) +download.o-libs := $(CURL_LIBS) |