summaryrefslogtreecommitdiffstats
path: root/BaseTools
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2022-11-05 12:43:24 -0700
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2022-11-08 18:29:51 +0000
commit0be81a4d83810cdb018d293bc264f489e7664043 (patch)
tree9d7f116f139bb2741f3be7197ba95e5aa94ae3d3 /BaseTools
parent6032b46dce1dea705f95ecfdb68656281f0822f7 (diff)
downloadedk2-0be81a4d83810cdb018d293bc264f489e7664043.tar.gz
edk2-0be81a4d83810cdb018d293bc264f489e7664043.tar.bz2
edk2-0be81a4d83810cdb018d293bc264f489e7664043.zip
BaseTools/Source/C: Use /Z7 instead of /Zi for host tools
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4139 Update ms.common and *.mak files to use /Z7 instead of /Zi to embed symbol information in obj files for host tools built with VS compilers. This prevents vcxxx.pdb files from being generated in the root of the local edk2 repository or in BaseTools directories. Cc: Bob Feng <bob.c.feng@intel.com> Cc: Liming Gao <gaoliming@byosoft.com.cn> Cc: Yuwei Chen <yuwei.chen@intel.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Source/C/Makefiles/ms.common5
-rw-r--r--BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak4
-rw-r--r--BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak6
-rw-r--r--BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak4
-rw-r--r--BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak7
5 files changed, 12 insertions, 14 deletions
diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index b2dbcf376c..8391f10d5d 100644
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -57,6 +57,5 @@ LINKER = $(LD)
INC = $(INC) -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common
-CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /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
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Z7 /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak
index 71b7c6b0b1..cde91a4715 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak
@@ -16,7 +16,7 @@ SET=$(PCCTS_HOME)\support\set
# Compiler stuff
CC = cl
CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
- -D "ZZLEXBUFSIZE=65536" -D "LONGFILENAMES" /Zi /W3 -D__USE_PROTOS /wd4700
+ -D "ZZLEXBUFSIZE=65536" -D "LONGFILENAMES" /Z7 /W3 -D__USE_PROTOS /wd4700
ANTLR_OBJS = antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
@@ -225,7 +225,7 @@ set.obj: $(SET)\set.c \
$(CC) -c $(CFLAGS) $(SET)\set.c
-clean:
+clean:
del *.obj
distclean:
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
index b30a73bb74..6fc4d5c15d 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
@@ -16,8 +16,8 @@ SET=$(PCCTS_HOME)\support\set
# Compiler stuff
CC = cl
CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
- -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /Zi /W3 -D__USE_PROTOS /wd4700 \
- /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
+ -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /Z7 /W3 -D__USE_PROTOS /wd4700 \
+ /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
ANTLR_OBJS = antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \
fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \
@@ -226,7 +226,7 @@ set.obj: $(SET)\set.c \
$(CC) -c $(CFLAGS) $(SET)\set.c
-clean:
+clean:
-del *.obj
-del *.ilk
-del *.pdb
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak
index 156d524acc..dcc259543c 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak
@@ -16,7 +16,7 @@ SET=$(PCCTS_HOME)\support\set
# Compiler stuff
CC = cl
CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
- -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /W3 /Zi
+ -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /W3 /Z7
DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
output.obj relabel.obj automata.obj
@@ -113,7 +113,7 @@ set.obj: $(SET)\set.c \
$(CC) -c $(CFLAGS) $(SET)\set.c
-clean:
+clean:
del *.obj
distclean:
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
index 2714308d4f..c2cac00f53 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
@@ -16,8 +16,8 @@ SET=$(PCCTS_HOME)\support\set
# Compiler stuff
CC = cl
CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
- -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /W3 /Zi \
- /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
+ -D "ZZLEXBUFSIZE=65536" /D "LONGFILENAMES" /W3 /Z7 \
+ /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE
DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
output.obj relabel.obj automata.obj
@@ -112,7 +112,7 @@ set.obj: $(SET)\set.c \
$(CC) -c $(CFLAGS) $(SET)\set.c
-clean:
+clean:
-del *.obj
-del *.ilk
-del *.pdb
@@ -123,4 +123,3 @@ cleanall:
-del *.pdb
-del *.exe
-del $(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe
-