BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / C / Makefiles / header.makefile

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 065a998bf5de6569d89d41a53db9e8d341d0cc85..90fb3453ad467ae6d6408bdcbaf50cf9ea3e1ef5 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -3,17 +3,10 @@
 # The makefile can be invoked with\r
 # HOST_ARCH = x86_64 or x64 for EM64T build\r
 # HOST_ARCH = ia32 or IA32 for IA32 build\r
-# HOST_ARCH = ia64 or IA64 for IA64 build\r
 # HOST_ARCH = Arm or ARM for ARM build\r
 #\r
 # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.    The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 ifndef HOST_ARCH\r
   #\r
@@ -68,12 +61,16 @@ $(error Bad HOST_ARCH)
 endif\r
 \r
 INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) \r
-BUILD_CPPFLAGS = $(INCLUDE) -O2\r
+BUILD_CPPFLAGS = $(INCLUDE)\r
+\r
+# keep EXTRA_OPTFLAGS last\r
+BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS)\r
+\r
 ifeq ($(DARWIN),Darwin)\r
 # assume clang or clang compatible flags on OS X\r
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-self-assign -Wno-unused-result -nostdlib -c -g\r
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g\r
 else\r
-BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g\r
+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -g\r
 endif\r
 BUILD_LFLAGS =\r
 BUILD_CXXFLAGS = -Wno-unused-result\r
@@ -91,7 +88,13 @@ ifeq ($(DARWIN),Darwin)
 endif\r
 endif\r
 \r
+# keep BUILD_OPTFLAGS last\r
+BUILD_CFLAGS   += $(BUILD_OPTFLAGS)\r
+BUILD_CXXFLAGS += $(BUILD_OPTFLAGS)\r
   \r
+# keep EXTRA_LDFLAGS last\r
+BUILD_LFLAGS += $(EXTRA_LDFLAGS)\r
+\r
 .PHONY: all\r
 .PHONY: install\r
 .PHONY: clean\r