diff options
Diffstat (limited to 'meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch')
| -rw-r--r-- | meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch new file mode 100644 index 0000000000..0fdc278ce2 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | From 2320650c6d381b914fe91b2dedaa5870279a8bcf Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | ||
| 3 | Date: Sun, 27 Nov 2016 18:42:55 -0800 | ||
| 4 | Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake | ||
| 5 | |||
| 6 | Prepend the build flags with those of bitbake. This is to build | ||
| 7 | using the bitbake native sysroot include and library directories. | ||
| 8 | |||
| 9 | Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com> | ||
| 10 | --- | ||
| 11 | BaseTools/Source/C/Makefiles/header.makefile | 8 ++++---- | ||
| 12 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile | ||
| 15 | index 821d114..fe0f08b 100644 | ||
| 16 | --- a/BaseTools/Source/C/Makefiles/header.makefile | ||
| 17 | +++ b/BaseTools/Source/C/Makefiles/header.makefile | ||
| 18 | @@ -44,14 +44,14 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/ | ||
| 19 | endif | ||
| 20 | |||
| 21 | INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) | ||
| 22 | -BUILD_CPPFLAGS = $(INCLUDE) -O2 | ||
| 23 | +BUILD_CPPFLAGS := $(BUILD_CPPFLAGS) $(INCLUDE) -O2 | ||
| 24 | ifeq ($(DARWIN),Darwin) | ||
| 25 | # assume clang or clang compatible flags on OS X | ||
| 26 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g | ||
| 27 | +BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g | ||
| 28 | else | ||
| 29 | -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g | ||
| 30 | +BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g | ||
| 31 | endif | ||
| 32 | -BUILD_LFLAGS = | ||
| 33 | +BUILD_LFLAGS := $(LDFLAGS) | ||
| 34 | BUILD_CXXFLAGS = | ||
| 35 | |||
| 36 | ifeq ($(ARCH), IA32) | ||
| 37 | -- | ||
| 38 | 2.9.3 | ||
| 39 | |||