diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-02-26 21:53:05 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-02 22:39:43 +0000 |
| commit | 73287654eb9aff844ddd4fed02fbd0489639d07a (patch) | |
| tree | d017f005a1eb5f759b7a16c17a5de938b7aff08e | |
| parent | 576587dae0eef3c6249d03bc27a045a0e5cf018c (diff) | |
| download | poky-73287654eb9aff844ddd4fed02fbd0489639d07a.tar.gz | |
grub2.inc: avoid passing -isystem to native builds
grub2 creates its own set of -nostdinc / -isystem / -ffreestanding
CFLAGS and OE's default BUILD_CFLAGS (assigned to CFLAGS for native
builds) etc, conflict with that.
(From OE-Core rev: b15b52dc8ab7dd273605c7dfd524c0a330bfd60b)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 5a12563975..0fdafd5c1b 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
| @@ -44,6 +44,15 @@ PACKAGECONFIG ??= "" | |||
| 44 | PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" | 44 | PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" |
| 45 | PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" | 45 | PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" |
| 46 | 46 | ||
| 47 | # grub2 creates its own set of -nostdinc / -isystem / -ffreestanding CFLAGS and | ||
| 48 | # OE's default BUILD_CFLAGS (assigned to CFLAGS for native builds) etc, conflict | ||
| 49 | # with that. Note that since BUILD_CFLAGS etc are not used by grub2 target | ||
| 50 | # builds, it's safe to clear them unconditionally for both target and native. | ||
| 51 | BUILD_CPPFLAGS = "" | ||
| 52 | BUILD_CFLAGS = "" | ||
| 53 | BUILD_CXXFLAGS = "" | ||
| 54 | BUILD_LDFLAGS = "" | ||
| 55 | |||
| 47 | do_configure_prepend() { | 56 | do_configure_prepend() { |
| 48 | # The grub2 configure script uses variables such as TARGET_CFLAGS etc | 57 | # The grub2 configure script uses variables such as TARGET_CFLAGS etc |
| 49 | # for its own purposes. Remove the OE versions from the environment to | 58 | # for its own purposes. Remove the OE versions from the environment to |
