diff options
| author | Michael S. Tsirkin | 2018-03-21 16:22:07 +0100 |
|---|---|---|
| committer | Marcel Apfelbaum | 2018-03-23 16:38:55 +0100 |
| commit | 9edc19c939914f4475ccf5f728c0617dc8f8076e (patch) | |
| tree | a6250e15fd4975bd45c9f2c5d10d80d0eef3dce5 /Makefile.target | |
| parent | rdma: fix up include directives (diff) | |
| download | qemu-9edc19c939914f4475ccf5f728c0617dc8f8076e.tar.gz qemu-9edc19c939914f4475ccf5f728c0617dc8f8076e.tar.xz qemu-9edc19c939914f4475ccf5f728c0617dc8f8076e.zip | |
make: switch from -I to -iquote
Our rule right now is to use <> for external headers,
"" for internal ones. The idea was to avoid conflicts
between e.g. a system file named <trace.h> and an
internal one by the same name.
Unfortunately we use -I compiler flag so it does not
help: a system file doing #include <trace.h> will
still pick up ours first.
To fix, switch to -iquote which is supported by both
gcc and clang and only affects #include "" directives.
As a side effect, this catches any future uses of
#include <> for internal headers.
Suggested-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index 6549481096..d0ec77a307 100644 --- a/Makefile.target +++ b/Makefile.target @@ -11,9 +11,9 @@ $(call set-vpath, $(SRC_PATH):$(BUILD_DIR)) ifdef CONFIG_LINUX QEMU_CFLAGS += -I../linux-headers endif -QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H +QEMU_CFLAGS += -iquote .. -iquote $(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H -QEMU_CFLAGS+=-I$(SRC_PATH)/include +QEMU_CFLAGS+=-iquote $(SRC_PATH)/include ifdef CONFIG_USER_ONLY # user emulator name |