Browse Source

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>
Michael D Kinney 1 year ago
parent
commit
0be81a4d83

+ 2 - 3
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
 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

+ 2 - 2
BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrDDK.mak

@@ -16,7 +16,7 @@ SET=$(PCCTS_HOME)\support\set
 # Compiler stuff
 # Compiler stuff
 CC = cl
 CC = cl
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
 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 \
 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 \
             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
     $(CC) -c $(CFLAGS) $(SET)\set.c
 
 
-clean:	
+clean:
     del *.obj
     del *.obj
 
 
 distclean:
 distclean:

+ 3 - 3
BaseTools/Source/C/VfrCompile/Pccts/antlr/AntlrMS.mak

@@ -16,8 +16,8 @@ SET=$(PCCTS_HOME)\support\set
 # Compiler stuff
 # Compiler stuff
 CC = cl
 CC = cl
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
 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 \
 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 \
             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
     $(CC) -c $(CFLAGS) $(SET)\set.c
 
 
-clean:	
+clean:
     -del *.obj
     -del *.obj
     -del *.ilk
     -del *.ilk
     -del *.pdb
     -del *.pdb

+ 2 - 2
BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgDDK.mak

@@ -16,7 +16,7 @@ SET=$(PCCTS_HOME)\support\set
 # Compiler stuff
 # Compiler stuff
 CC = cl
 CC = cl
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
 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 \
 DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
            output.obj relabel.obj automata.obj
            output.obj relabel.obj automata.obj
@@ -113,7 +113,7 @@ set.obj: $(SET)\set.c \
 
 
     $(CC) -c $(CFLAGS) $(SET)\set.c
     $(CC) -c $(CFLAGS) $(SET)\set.c
 
 
-clean:	
+clean:
     del *.obj
     del *.obj
 
 
 distclean:
 distclean:

+ 3 - 4
BaseTools/Source/C/VfrCompile/Pccts/dlg/DlgMS.mak

@@ -16,8 +16,8 @@ SET=$(PCCTS_HOME)\support\set
 # Compiler stuff
 # Compiler stuff
 CC = cl
 CC = cl
 CFLAGS = /nologo -I "." -I "$(PCCTS_H)" -I "$(SET)" -D "USER_ZZSYN" -D "PC" \
 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 \
 DLG_OBJS = dlg_p.obj dlg_a.obj main.obj err.obj support.obj \
            output.obj relabel.obj automata.obj
            output.obj relabel.obj automata.obj
@@ -112,7 +112,7 @@ set.obj: $(SET)\set.c \
 
 
     $(CC) -c $(CFLAGS) $(SET)\set.c
     $(CC) -c $(CFLAGS) $(SET)\set.c
 
 
-clean:	
+clean:
     -del *.obj
     -del *.obj
     -del *.ilk
     -del *.ilk
     -del *.pdb
     -del *.pdb
@@ -123,4 +123,3 @@ cleanall:
     -del *.pdb
     -del *.pdb
 		-del *.exe
 		-del *.exe
     -del $(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe
     -del $(EDK_TOOLS_PATH)\Bin\Win32\dlg.exe
-