[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/17] Makefile: pass include directives to dtc via C
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 16/17] Makefile: pass include directives to dtc via CPPFLAGS, not CFLAGS |
Date: |
Sat, 22 Jun 2013 13:24:35 +0400 |
From: Peter Maydell <address@hidden>
The dtc submodule's makefile expects -I include directives to be
in CPPFLAGS, not CFLAGS. Getting this wrong meant that the include
directive would not be applied when generating the dependency .d
files. This in turn meant that we couldn't build libfdt when
doing an out of tree build with clang. (gcc's dependency output
is slightly different from clang in this situation so it happened
to work.)
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
Makefile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 3cfa7d0..c06bfab 100644
--- a/Makefile
+++ b/Makefile
@@ -146,10 +146,11 @@ $(SRC_PATH)/pixman/configure:
(cd $(SRC_PATH)/pixman; autoreconf -v --install)
DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)"
LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt
-DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS) -I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc
-I$(SRC_PATH)/dtc/libfdt
+DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)
+DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
subdir-dtc:dtc/libfdt dtc/tests
- $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CFLAGS="$(DTC_CFLAGS)"
LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)"
$(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)
+ $(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS)
CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)"
ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS)
libfdt/libfdt.a,)
dtc/%:
mkdir -p $@
--
1.7.10.4
- [Qemu-devel] [PULL 00/17] Trivial patches for 2013-06-22, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 01/17] vl: reformat SDL ifdeffery a bit, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 02/17] qemu-options: trivial fix for -mon args help, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 03/17] qemu-img: Add missing GCC_FMT_ATTR, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 04/17] kvm: Fix potential resource leak (missing fclose), Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 05/17] savevm: Fix potential memory leak, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 12/17] vnc: use booleans for vnc_connect, vnc_listen_read and vnc_display_add_client, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 17/17] configure: Add signed*signed check to [u]int128_t test, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 16/17] Makefile: pass include directives to dtc via CPPFLAGS, not CFLAGS,
Michael Tokarev <=
- [Qemu-devel] [PULL 08/17] configure: Fix "ERROR: ERROR: " for missing/incompatible DTC, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 13/17] qemu-char: use bool in qemu_chr_open_socket and simplify code a bit, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 07/17] audio: Replace static functions in header file by macros, remove GCC_ATTR, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 09/17] acl: acl_add can't insert before last list element, fix, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 06/17] libcacard: Fix cppcheck warning and remove unneeded code, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 15/17] qapi: lack of two commas in dict, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 10/17] qxl: Fix QXLRam initialisation., Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 14/17] sd: pass bool parameter for sd_init, Michael Tokarev, 2013/06/22
- [Qemu-devel] [PULL 11/17] block/nand: Formatting sweep, Michael Tokarev, 2013/06/22