|
 |
285b94 |
From 26296351f9a6b6dad0604f8ed62ce5de0f41ac2c Mon Sep 17 00:00:00 2001
|
|
|
285b94 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
285b94 |
Date: Thu, 26 Jul 2018 00:04:26 +0200
|
|
|
285b94 |
Subject: [PATCH] BaseTools/Source/C: take EXTRA_OPTFLAGS from the caller
|
|
|
285b94 |
|
|
|
285b94 |
Allow the caller of the top-level makefile either to set EXTRA_OPTFLAGS in
|
|
|
285b94 |
the environment or to pass EXTRA_OPTFLAGS as a macro definition on the
|
|
|
285b94 |
command line. EXTRA_OPTFLAGS extends (and potentially overrides) default C
|
|
|
285b94 |
compilation flags set in the makefiles.
|
|
|
285b94 |
|
|
|
285b94 |
Cc: Liming Gao <liming.gao@intel.com>
|
|
|
285b94 |
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
|
|
|
285b94 |
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
|
|
|
285b94 |
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
|
285b94 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
285b94 |
Reviewed-by: Liming Gao <liming.gao@intel.com>
|
|
|
285b94 |
(cherry picked from commit b0ca5dae78ff71397a8ef568f1914da7668ff5a9)
|
|
|
285b94 |
---
|
|
|
285b94 |
BaseTools/Source/C/Makefiles/header.makefile | 5 ++++-
|
|
|
285b94 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
285b94 |
|
|
|
285b94 |
diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
|
|
|
285b94 |
index 498c6cf48b..1b4cad5497 100644
|
|
|
285b94 |
--- a/BaseTools/Source/C/Makefiles/header.makefile
|
|
|
285b94 |
+++ b/BaseTools/Source/C/Makefiles/header.makefile
|
|
|
285b94 |
@@ -69,7 +69,10 @@ endif
|
|
|
285b94 |
|
|
|
285b94 |
INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE)
|
|
|
285b94 |
BUILD_CPPFLAGS = $(INCLUDE)
|
|
|
285b94 |
-BUILD_OPTFLAGS = -O2
|
|
|
285b94 |
+
|
|
|
285b94 |
+# keep EXTRA_OPTFLAGS last
|
|
|
285b94 |
+BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)
|
|
|
285b94 |
+
|
|
|
285b94 |
ifeq ($(DARWIN),Darwin)
|
|
|
285b94 |
# assume clang or clang compatible flags on OS X
|
|
|
285b94 |
BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
|