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>

diff --git a/BaseTools/Source/C/Makefiles/ms.common b/BaseTools/Source/C/Makefiles/ms.common
index b2dbcf376c045f23db0d1c865b67b5ee586e0b4e..8391f10d5dd2efdd336e92d5ebc13fe813d64bc4 100644 (file)
--- a/BaseTools/Source/C/Makefiles/ms.common
+++ b/BaseTools/Source/C/Makefiles/ms.common
@@ -57,6 +57,5 @@ LINKER = $(LD)
 \r
 INC = $(INC) -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common\r
 \r
-CFLAGS = $(CFLAGS) /nologo /Zi /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Zi /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
-\r
+CFLAGS = $(CFLAGS) /nologo /Z7 /c /O2 /MT /W4 /WX /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /Z7 /c /O2 /MT /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak
index 71b7c6b0b141112b9a8b407b8ea949a9f46fcbde..cde91a47159e3136c9cda41eb3096b2e95bdc730 100644 (file)
--- 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\r
 CC = cl\r
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \\r
-        -D "ZZLEXBUFSIZE=65536"  -D "LONGFILENAMES" /Zi /W3 -D__USE_PROTOS /wd4700\r
+        -D "ZZLEXBUFSIZE=65536"  -D "LONGFILENAMES" /Z7 /W3 -D__USE_PROTOS /wd4700\r
 \r
 ANTLR_OBJS = antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
             fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
@@ -225,7 +225,7 @@ set.obj: $(SET)\set.c \
 \r
     $(CC) -c $(CFLAGS) $(SET)\set.c\r
 \r
-clean: \r
+clean:\r
     del *.obj\r
 \r
 distclean:\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak
index b30a73bb7424daade69a85c12ae3670c24e91b1d..6fc4d5c15d6c64de81dc77a12e5e232a9d71b024 100644 (file)
--- 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\r
 CC = cl\r
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \\r
-        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /Zi /W3 -D__USE_PROTOS /wd4700 \\r
-         /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
+        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /Z7 /W3 -D__USE_PROTOS /wd4700 \\r
+         /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
 \r
 ANTLR_OBJS = antlr.obj scan.obj err.obj bits.obj build.obj fset2.obj \\r
             fset.obj gen.obj globals.obj hash.obj lex.obj main.obj \\r
@@ -226,7 +226,7 @@ set.obj: $(SET)\set.c \
 \r
     $(CC) -c $(CFLAGS) $(SET)\set.c\r
 \r
-clean: \r
+clean:\r
     -del *.obj\r
     -del *.ilk\r
     -del *.pdb\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak
index 156d524acc944e1ddd674cc977204553d698e742..dcc259543c4cbbde9c0d6089f938be627a22b17a 100644 (file)
--- 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\r
 CC = cl\r
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \\r
-        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /W3 /Zi\r
+        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /W3 /Z7\r
 \r
 DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \\r
            output.obj relabel.obj automata.obj\r
@@ -113,7 +113,7 @@ set.obj: $(SET)\set.c \
 \r
     $(CC) -c $(CFLAGS) $(SET)\set.c\r
 \r
-clean: \r
+clean:\r
     del *.obj\r
 \r
 distclean:\r

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak b/BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak
index 2714308d4fa088bc1cb1e7b76f856f8b0f184911..c2cac00f53dfca87a8338043b9bc29fdfa43c047 100644 (file)
--- 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\r
 CC = cl\r
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \\r
-        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /W3 /Zi \\r
-        /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \r
+        -D "ZZLEXBUFSIZE=65536"  /D "LONGFILENAMES" /W3 /Z7 \\r
+        /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE\r
 \r
 DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \\r
            output.obj relabel.obj automata.obj\r
@@ -112,7 +112,7 @@ set.obj: $(SET)\set.c \
 \r
     $(CC) -c $(CFLAGS) $(SET)\set.c\r
 \r
-clean: \r
+clean:\r
     -del *.obj\r
     -del *.ilk\r
     -del *.pdb\r
@@ -123,4 +123,3 @@ cleanall:
     -del *.pdb\r
                -del *.exe\r
     -del $(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe\r
-\r