From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: "Pawel Polawski" <ppolawsk@redhat.com>,
"Dongyan Qian" <qiandongyan@loongson.cn>,
"Sunil V L" <sunilvl@ventanamicro.com>,
"Baoqi Zhang" <zhangbaoqi@loongson.cn>,
"Chao Li" <lichao@loongson.cn>,
"Rebecca Cran" <rebecca@bsdio.com>,
"Ard Biesheuvel" <ardb+tianocore@kernel.org>,
"Zhiguang Liu" <zhiguang.liu@intel.com>,
"Liming Gao" <gaoliming@byosoft.com.cn>,
"Yuwei Chen" <yuwei.chen@intel.com>,
"Marvin Häuser" <mhaeuser@posteo.de>,
"Leif Lindholm" <quic_llindhol@quicinc.com>,
"Michael D Kinney" <michael.d.kinney@intel.com>,
"Daniel Schaefer" <git@danielschaefer.me>,
"Bob Feng" <bob.c.feng@intel.com>,
"Oliver Steffen" <osteffen@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH v4 01/10] BaseTools: add BASETOOLS define
Date: Fri, 14 Apr 2023 10:02:41 +0200 [thread overview]
Message-ID: <20230414080250.1357004-2-kraxel@redhat.com> (raw)
In-Reply-To: <20230414080250.1357004-1-kraxel@redhat.com>
Allows for BaseTools-specific tweaks in include files.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
| 3 +++
BaseTools/Source/C/Makefiles/ms.common | 4 ++--
BaseTools/Source/C/VfrCompile/GNUmakefile | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
--git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index 1bf003523baf..6b743fa297b0 100644
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -124,6 +124,9 @@ ifeq ($(DARWIN),Darwin)
endif
endif
+CFLAGS += -D BASETOOLS=1
+CXXFLAGS += -D BASETOOLS=1
+
# keep BUILD_OPTFLAGS last
CFLAGS += $(BUILD_OPTFLAGS)
CXXFLAGS += $(BUILD_OPTFLAGS)
diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index 8391f10d5dd2..6fc4c6477847 100644
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -57,5 +57,5 @@ LINKER = $(LD)
INC = $(INC) -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common
-CFLAGS = $(CFLAGS) /nologo /Z7 /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Z7 /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
+CFLAGS = $(CFLAGS) /nologo /Z7 /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D BASETOOLS
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Z7 /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE /D BASETOOLS
diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile
index 7d5976649dba..f1abed11376e 100644
--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile
@@ -24,6 +24,7 @@ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
endif
# keep BUILD_OPTFLAGS last
VFR_CXXFLAGS = $(BUILD_OPTFLAGS)
+VFR_CXXFLAGS += -D BASETOOLS=1
# keep EXTRA_LDFLAGS last
VFR_LFLAGS = $(EXTRA_LDFLAGS)
--
2.39.2
next prev parent reply other threads:[~2023-04-14 8:03 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 8:02 [PATCH v4 00/10] BaseTools: remove duplicate includes Gerd Hoffmann
2023-04-14 8:02 ` Gerd Hoffmann [this message]
2023-04-14 12:29 ` [PATCH v4 01/10] BaseTools: add BASETOOLS define Marvin Häuser
2023-04-14 14:37 ` Gerd Hoffmann
2023-04-14 14:51 ` Marvin Häuser
2023-04-14 14:57 ` [edk2-devel] " Ard Biesheuvel
2023-04-14 15:10 ` Marvin Häuser
2023-04-18 11:52 ` Gerd Hoffmann
2023-04-18 11:59 ` Ard Biesheuvel
2023-04-18 13:20 ` Gerd Hoffmann
2023-04-18 13:41 ` Marvin Häuser
2023-04-18 15:50 ` Ard Biesheuvel
2023-04-21 3:26 ` 回复: " gaoliming
2023-05-22 12:27 ` Gerd Hoffmann
2023-05-22 12:55 ` Ard Biesheuvel
2023-05-22 13:38 ` Gerd Hoffmann
2023-05-22 14:31 ` Gerd Hoffmann
2023-05-23 7:07 ` Ard Biesheuvel
2023-05-23 8:49 ` Gerd Hoffmann
2023-05-23 8:54 ` Ard Biesheuvel
2023-04-14 8:02 ` [PATCH v4 02/10] MdePkg: don't set visibility to hidden for BaseTools Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 03/10] BaseTools: remove WinNtInclude.h Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 04/10] BaseTools: remove duplicate includes: <arch>/ProcessorBind.h Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 05/10] BaseTools: remove duplicate includes: IndustryStandard/Acpi*.h Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 06/10] MdePkg/PeImage.h: add bits from BaseTools version Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 07/10] BaseTools: drop IMAGE_FILE_MACHINE_ARM hacks Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 08/10] BaseTools: switch from EFI_IMAGE_MACHINE_* to IMAGE_FILE_MACHINE_* Gerd Hoffmann
2023-04-14 12:16 ` [edk2-devel] " Rebecca Cran
2023-04-14 14:39 ` Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 09/10] BaseTools: remove duplicate includes: IndustryStandard/PeImage.h Gerd Hoffmann
2023-04-14 8:02 ` [PATCH v4 10/10] BaseTools: remove duplicate includes: IndustryStandard/*.h Gerd Hoffmann
2023-04-14 12:18 ` [edk2-devel] [PATCH v4 00/10] BaseTools: remove duplicate includes Rebecca Cran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230414080250.1357004-2-kraxel@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox