projects / platform / upstream / llvm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96d933d) | patch
Reapply "llvm-mt: implement simple merging of manifests, not factoring namespaces.
authorEric Beckmann <ecbeckmann@google.com>
Wed, 26 Jul 2017 00:25:12 +0000 (00:25 +0000)
committerEric Beckmann <ecbeckmann@google.com>
Wed, 26 Jul 2017 00:25:12 +0000 (00:25 +0000)
commitb4dbe7231e7eb1852248f6ed29fb57d9e9af06de
tree7374b61856c8d40eae43f814198b73c70332dc04tree | snapshot
parent96d933da4f7e379c827d78a2fc0bc25ea335e4edcommit | diff
Reapply "llvm-mt: implement simple merging of manifests, not factoring namespaces.

This time with correct #if.

This reverts commit 9cf4eca0e0383040c1ff1416815c7f649650c2a0.

llvm-svn: 309064
llvm/include/llvm/Support/WindowsManifestMerger.h diff | blob | history
llvm/lib/Support/WindowsManifestMerger.cpp diff | blob | history
llvm/test/tools/llvm-mt/Inputs/additional.manifest [new file with mode: 0644] blob
llvm/test/tools/llvm-mt/Inputs/conflicting.manifest [new file with mode: 0644] blob
llvm/test/tools/llvm-mt/Inputs/test_manifest.manifest diff | blob | history
llvm/test/tools/llvm-mt/conflicting.test [new file with mode: 0644] blob
llvm/test/tools/llvm-mt/simple_merge.test [new file with mode: 0644] blob
llvm/tools/llvm-mt/llvm-mt.cpp diff | blob | history
Domain: System / Toolchain;