Fix major bug in my last checkin. :(

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6688 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/link/link.cpp b/tools/link/link.cpp
index 99181f3344a5daa52366def4f520447f7d5f899b..58959cfa41629b20bae0ff60c0882f99a7513df5 100644 (file)
--- a/tools/link/link.cpp
+++ b/tools/link/link.cpp
@@ -106,6 +106,7 @@ int main(int argc, char **argv) {
   if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get();
 
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
+  if (OutputFilename != "-") {
     if (!Force && std::ifstream(OutputFilename.c_str())) {
       // If force is not specified, make sure not to overwrite a file!
       std::cerr << argv[0] << ": error opening '" << OutputFilename

diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp
index 99181f3344a5daa52366def4f520447f7d5f899b..58959cfa41629b20bae0ff60c0882f99a7513df5 100644 (file)
--- a/tools/llvm-link/llvm-link.cpp
+++ b/tools/llvm-link/llvm-link.cpp
@@ -106,6 +106,7 @@ int main(int argc, char **argv) {
   if (DumpAsm) std::cerr << "Here's the assembly:\n" << Composite.get();
 
   std::ostream *Out = &std::cout;  // Default to printing to stdout...
+  if (OutputFilename != "-") {
     if (!Force && std::ifstream(OutputFilename.c_str())) {
       // If force is not specified, make sure not to overwrite a file!
       std::cerr << argv[0] << ": error opening '" << OutputFilename