forked from brl/citadel
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
From 2320650c6d381b914fe91b2dedaa5870279a8bcf Mon Sep 17 00:00:00 2001
|
|
From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
|
|
Date: Sun, 27 Nov 2016 18:42:55 -0800
|
|
Subject: [PATCH] BaseTools: makefile: adjust to build in under bitbake
|
|
|
|
Prepend the build flags with those of bitbake. This is to build
|
|
using the bitbake native sysroot include and library directories.
|
|
|
|
Signed-off-by: Ricardo Neri <ricardo.neri@linux.intel.com>
|
|
Upstream-Status: Pending
|
|
---
|
|
BaseTools/Source/C/Makefiles/header.makefile | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: git/BaseTools/Source/C/Makefiles/header.makefile
|
|
===================================================================
|
|
--- git.orig/BaseTools/Source/C/Makefiles/header.makefile
|
|
+++ git/BaseTools/Source/C/Makefiles/header.makefile
|
|
@@ -44,15 +44,15 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AA
|
|
endif
|
|
|
|
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
|
|
-BUILD_CPPFLAGS = $(INCLUDE) -O2
|
|
+BUILD_CPPFLAGS += $(INCLUDE) -O2
|
|
ifeq ($(DARWIN),Darwin)
|
|
# assume clang or clang compatible flags on OS X
|
|
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
|
|
else
|
|
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
|
|
+BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g
|
|
endif
|
|
-BUILD_LFLAGS =
|
|
-BUILD_CXXFLAGS = -Wno-unused-result
|
|
+BUILD_LFLAGS = $(LDFLAGS)
|
|
+BUILD_CXXFLAGS += -Wno-unused-result
|
|
|
|
ifeq ($(ARCH), IA32)
|
|
#
|