maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

gn build: Revert r353094 (bad merge) 

llvm-svn: 353098
This commit is contained in:
David Major 2019-02-04 21:25:13 +00:00
parent a69146e67e
commit d1934853a8
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
llvm/utils/gn/build/toolchain/BUILD.gn
View File

@ -50,7 +50,7 @@ template("unix_toolchain") {
# Remove the output file first so that ar doesn't try to modify the
# existing file.
command =
"rm -f {{output}} && $ar rcsDT {{arflags}} {{output}} {{inputs}}"
"rm -f {{output}} && $ar rcsD {{arflags}} {{output}} {{inputs}}"
}
description = "AR {{output}}"
outputs = [
@ -234,11 +234,9 @@ toolchain("win") {
}
tool("solink") {
outprefix = "{{output_dir}}/{{target_output_name}}"
dllfile = "$outprefix{{output_extension}}"
libfile = "$outprefix.lib"
pdbfile = "$outprefix.pdb"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /implib:$libfile /pdb:$pdbfile {{libs}} {{inputs}}"
dllfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
libfile = "$dllfile.lib"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /implib:$libfile {{libs}} /pdb:$dllfile.pdb {{inputs}}"
description = "LINK $dllfile"
link_output = libfile
depend_output = libfile
@ -261,10 +259,8 @@ toolchain("win") {
# standalone loadable modules used for unit-testing LLVM's dynamic library
# loading code.
tool("solink_module") {
outprefix = "{{output_dir}}/{{target_output_name}}"
dllfile = "$outprefix{{output_extension}}"
pdbfile = "$outprefix.pdb"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile /pdb:$pdbfile {{libs}} {{inputs}}"
dllfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
command = "$link /nologo /dll {{ldflags}} /out:$dllfile {{libs}} /pdb:$dllfile.pdb {{inputs}}"
description = "LINK_MODULE $dllfile"
outputs = [
dllfile,
@ -276,10 +272,8 @@ toolchain("win") {
}
tool("link") {
outprefix = "{{output_dir}}/{{target_output_name}}"
outfile = "$outprefix{{output_extension}}"
pdbfile = "$outprefix.pdb"
command = "$link /nologo {{ldflags}} /out:$outfile /pdb:$pdbfile {{libs}} {{inputs}}"
outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
command = "$link /nologo {{ldflags}} /out:$outfile {{libs}} /pdb:$outfile.pdb {{inputs}}"
description = "LINK $outfile"
outputs = [
outfile,