[lld] r309231 - lld: /manifestuac:no shouldn't disable /manifestdependency:

[Nico Weber via llvm-commits]

Author: nico
Date: Wed Jul 26 16:38:10 2017
New Revision: 309231

URL: http://llvm.org/viewvc/llvm-project?rev=309231&view=rev
Log:
lld: /manifestuac:no shouldn't disable /manifestdependency:

Matches link.exe
https://reviews.llvm.org/D35872

Modified:
    lld/trunk/COFF/DriverUtils.cpp
    lld/trunk/test/COFF/manifest.test

Modified: lld/trunk/COFF/DriverUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/DriverUtils.cpp?rev=309231&r1=309230&r2=309231&view=diff
==============================================================================
--- lld/trunk/COFF/DriverUtils.cpp (original)
+++ lld/trunk/COFF/DriverUtils.cpp Wed Jul 26 16:38:10 2017
@@ -337,13 +337,13 @@ TemporaryFile createDefaultXml() {
        << "      </requestedPrivileges>\n"
        << "    </security>\n"
        << "  </trustInfo>\n";
-    if (!Config->ManifestDependency.empty()) {
-      OS << "  <dependency>\n"
-         << "    <dependentAssembly>\n"
-         << "      <assemblyIdentity " << Config->ManifestDependency << " />\n"
-         << "    </dependentAssembly>\n"
-         << "  </dependency>\n";
-    }
+  }
+  if (!Config->ManifestDependency.empty()) {
+    OS << "  <dependency>\n"
+       << "    <dependentAssembly>\n"
+       << "      <assemblyIdentity " << Config->ManifestDependency << " />\n"
+       << "    </dependentAssembly>\n"
+       << "  </dependency>\n";
   }
   OS << "</assembly>\n";
   OS.close();

Modified: lld/trunk/test/COFF/manifest.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/manifest.test?rev=309231&r1=309230&r2=309231&view=diff
==============================================================================
--- lld/trunk/test/COFF/manifest.test (original)
+++ lld/trunk/test/COFF/manifest.test Wed Jul 26 16:38:10 2017
@@ -57,10 +57,24 @@ DEPENDENCY:     </dependentAssembly>
 DEPENDENCY:   </dependency>
 DEPENDENCY: </assembly>
 
-# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no %t.obj
+# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no \
+# RUN:   /manifestdependency:"foo='bar'" %t.obj
 # RUN: FileCheck -check-prefix=NOUAC %s < %t.exe.manifest
 
 NOUAC: <?xml version="1.0" standalone="yes"?>
 NOUAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
 NOUAC:           manifestVersion="1.0">
+NOUAC:   <dependency>
+NOUAC:     <dependentAssembly>
+NOUAC:       <assemblyIdentity foo='bar' />
+NOUAC:     </dependentAssembly>
+NOUAC:   </dependency>
 NOUAC: </assembly>
+
+# RUN: lld-link /manifest /out:%t.exe /entry:main /manifestuac:no %t.obj
+# RUN: FileCheck -check-prefix=NOUACNODEP %s < %t.exe.manifest
+
+NOUACNODEP: <?xml version="1.0" standalone="yes"?>
+NOUACNODEP: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+NOUACNODEP:           manifestVersion="1.0">
+NOUACNODEP: </assembly>