/[packages]/cauldron/edk2/current/SOURCES/0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch
ViewVC logotype

Contents of /cauldron/edk2/current/SOURCES/0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1330132 - (show annotations) (download)
Fri Nov 16 09:43:44 2018 UTC (5 years, 5 months ago) by tv
File size: 2172 byte(s)
- Fix passing through RPM build flags (rhbz#1540244)
- Fix network boot via grub (bz 1648476)
- Explicitly compile the scripts using py_byte_compile
- Add -qosb dependency on python3
1 From 0af592dfa9a6d1a3379db1331344f411f7774bea Mon Sep 17 00:00:00 2001
2 From: Laszlo Ersek <lersek@redhat.com>
3 Date: Wed, 25 Jul 2018 22:40:09 +0200
4 Subject: [PATCH] BaseTools/header.makefile: remove "-c" from BUILD_CFLAGS
5
6 Option "-c" is a mode selection flag (choosing between compiling and
7 linking); it should not be in BUILD_CFLAGS, which applies only to
8 compiling anyway. The compilation rule for C source files, in
9 "footer.makefile", already includes "-c" -- currently we have double "-c"
10 options.
11
12 This patch doesn't change behavior.
13
14 Cc: Liming Gao <liming.gao@intel.com>
15 Cc: Yonghong Zhu <yonghong.zhu@intel.com>
16 Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244
17 Contributed-under: TianoCore Contribution Agreement 1.1
18 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
19 Reviewed-by: Liming Gao <liming.gao@intel.com>
20 (cherry picked from commit 03252ae287c4a61983b3793ff71baeabe2ff3df7)
21 ---
22 BaseTools/Source/C/Makefiles/header.makefile | 4 ++--
23 1 file changed, 2 insertions(+), 2 deletions(-)
24
25 diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
26 index db436773cf..08421ba24c 100644
27 --- a/BaseTools/Source/C/Makefiles/header.makefile
28 +++ b/BaseTools/Source/C/Makefiles/header.makefile
29 @@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE
30 BUILD_CPPFLAGS = $(INCLUDE) -O2
31 ifeq ($(DARWIN),Darwin)
32 # assume clang or clang compatible flags on OS X
33 -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g
34 +BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g
35 else
36 -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g
37 +BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -g
38 endif
39 BUILD_LFLAGS =
40 BUILD_CXXFLAGS = -Wno-unused-result

  ViewVC Help
Powered by ViewVC 1.1.30