gn build: Windows: use a more standard format for PDB filenames

The current build was producing names like llvm-undname.exe.pdb, which looks unusual to me at least. This switches them to the more common llvm-undname.pdb style.

Differential Revision: https://reviews.llvm.org/D57613

llvm-svn: 353099
This commit is contained in:
David Major 2019-02-04 21:27:38 +00:00
parent d1934853a8
commit 1137fce9e9
1 changed files with 13 additions and 7 deletions
llvm/utils/gn/build/toolchain

View File

@ -234,9 +234,11 @@ toolchain("win") {
} }
tool("solink") { tool("solink") {
dllfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" outprefix = "{{output_dir}}/{{target_output_name}}"
libfile = "$dllfile.lib" dllfile = "$outprefix{{output_extension}}"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /implib:$libfile {{libs}} /pdb:$dllfile.pdb {{inputs}}" libfile = "$outprefix.lib"
pdbfile = "$outprefix.pdb"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /implib:$libfile /pdb:$pdbfile {{libs}} {{inputs}}"
description = "LINK $dllfile" description = "LINK $dllfile"
link_output = libfile link_output = libfile
depend_output = libfile depend_output = libfile
@ -259,8 +261,10 @@ toolchain("win") {
# standalone loadable modules used for unit-testing LLVM's dynamic library # standalone loadable modules used for unit-testing LLVM's dynamic library
# loading code. # loading code.
tool("solink_module") { tool("solink_module") {
dllfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" outprefix = "{{output_dir}}/{{target_output_name}}"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile {{libs}} /pdb:$dllfile.pdb {{inputs}}" dllfile = "$outprefix{{output_extension}}"
pdbfile = "$outprefix.pdb"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /pdb:$pdbfile {{libs}} {{inputs}}"
description = "LINK_MODULE $dllfile" description = "LINK_MODULE $dllfile"
outputs = [ outputs = [
dllfile, dllfile,
@ -272,8 +276,10 @@ toolchain("win") {
} }
tool("link") { tool("link") {
outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}" outprefix = "{{output_dir}}/{{target_output_name}}"
command = "$link /nologo {{ldflags}} /out:$outfile {{libs}} /pdb:$outfile.pdb {{inputs}}" outfile = "$outprefix{{output_extension}}"
pdbfile = "$outprefix.pdb"
command = "$link /nologo {{ldflags}} /out:$outfile /pdb:$pdbfile {{libs}} {{inputs}}"
description = "LINK $outfile" description = "LINK $outfile"
outputs = [ outputs = [
outfile, outfile,