From: Katsuhiro Ueno <uenobk@gmail.com>
Date: Thu, 29 Apr 2021 02:43:07 +0000 (+0900)
Subject: meson: Set implicit_include_directories to false
X-Git-Tag: v6.1.0-rc0~100^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75eebe0b1f15464d19a39c4186bfabf328ab601a;p=thirdparty%2Fqemu.git

meson: Set implicit_include_directories to false

Without this, libvixl cannot be compiled with macOS 11.3 SDK due to
include file name conflict (usr/include/c++/v1/version conflicts with
VERSION).

Signed-off-by: Katsuhiro Ueno <uenobk@gmail.com>
Message-Id: <CA+pCdY09+OQfXq3YmRNuQE59ACOq7Py2q4hqOwgq4PnepCXhTA@mail.gmail.com>
Tested-by: Alexander Graf <agraf@csgraf.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/meson.build b/meson.build
index 632b380738d..20d7035e447 100644
--- a/meson.build
+++ b/meson.build
@@ -2145,6 +2145,7 @@ common_all = common_ss.apply(config_all, strict: false)
 common_all = static_library('common',
                             build_by_default: false,
                             sources: common_all.sources() + genh,
+                            implicit_include_directories: false,
                             dependencies: common_all.dependencies(),
                             name_suffix: 'fa')