//===- SystemUtils.cpp - Utilities for low-level system tasks -------------===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file was developed by the LLVM research group and is distributed under
// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file contains functions used to do a variety of low-level, often
//
//===----------------------------------------------------------------------===//
+#include "llvm/Support/Streams.h"
#include "llvm/Support/SystemUtils.h"
-#include "llvm/System/Program.h"
#include "llvm/System/Process.h"
-#include <iostream>
-
+#include "llvm/System/Program.h"
+#include <ostream>
using namespace llvm;
-bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check) {
- if (stream_to_check == &std::cout && sys::Process::StandardOutIsDisplayed()) {
- std::cerr << "WARNING: You're attempting to print out a bytecode file.\n";
- std::cerr << "This is inadvisable as it may cause display problems. If\n";
- std::cerr << "you REALLY want to taste LLVM bytecode first-hand, you can\n";
- std::cerr << "force output with the `-f' option.\n\n";
+bool llvm::CheckBytecodeOutputToConsole(std::ostream* stream_to_check,
+ bool print_warning) {
+ if (stream_to_check == cout.stream() &&
+ sys::Process::StandardOutIsDisplayed()) {
+ if (print_warning) {
+ cerr << "WARNING: You're attempting to print out a bytecode file.\n"
+ << "This is inadvisable as it may cause display problems. If\n"
+ << "you REALLY want to taste LLVM bytecode first-hand, you\n"
+ << "can force output with the `-f' option.\n\n";
+ }
return true;
}
return false;
#undef FindExecutable // needed on windows :(
sys::Path llvm::FindExecutable(const std::string &ExeName,
const std::string &ProgramPath) {
- // First check the directory that the calling program is in. We can do this
+ // First check the directory that the calling program is in. We can do this
// if ProgramPath contains at least one / character, indicating that it is a
// relative path to bugpoint itself.
sys::Path Result ( ProgramPath );
- Result.elideFile();
+ Result.eraseComponent();
if (!Result.isEmpty()) {
- Result.appendFile(ExeName);
- if (Result.executable())
+ Result.appendComponent(ExeName);
+ if (Result.canExecute())
return Result;
}