[llvm] r353098 - gn build: Revert r353094 (bad merge)

[David Major via llvm-commits]

Author: dmajor
Date: Mon Feb  4 13:25:13 2019
New Revision: 353098

URL: http://llvm.org/viewvc/llvm-project?rev=353098&view=rev
Log:
gn build: Revert r353094 (bad merge)


Modified:
    llvm/trunk/utils/gn/build/toolchain/BUILD.gn

Modified: llvm/trunk/utils/gn/build/toolchain/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/build/toolchain/BUILD.gn?rev=353098&r1=353097&r2=353098&view=diff
==============================================================================
--- llvm/trunk/utils/gn/build/toolchain/BUILD.gn (original)
+++ llvm/trunk/utils/gn/build/toolchain/BUILD.gn Mon Feb  4 13:25:13 2019
@@ -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,