6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-27 02:31:09 +00:00
Code Issues Projects Releases Wiki Activity

For PR351:

Browse Source 
Adjust to interface change for FindExecutable.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18920 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer 2004-12-13 23:44:23 +00:00
parent 51ab8ec66e
commit 93f8f55e19
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/gccld/gccld.cpp
View File

@ -119,7 +119,7 @@ static void EmitShellScript(char **argv) {
// Windows doesn't support #!/bin/sh style shell scripts in .exe files. To // Windows doesn't support #!/bin/sh style shell scripts in .exe files. To
// support windows systems, we copy the llvm-stub.exe executable from the // support windows systems, we copy the llvm-stub.exe executable from the
// build tree to the destination file. // build tree to the destination file.
std::string llvmstub = FindExecutable("llvm-stub.exe", argv[0]); std::string llvmstub = FindExecutable("llvm-stub.exe", argv[0]).toString();
if (llvmstub.empty()) { if (llvmstub.empty()) {
std::cerr << "Could not find llvm-stub.exe executable!\n"; std::cerr << "Could not find llvm-stub.exe executable!\n";
exit(1); exit(1);
@ -283,11 +283,11 @@ int main(int argc, char **argv, char **envp) {
sys::RemoveFileOnSignal(sys::Path(OutputFilename)); sys::RemoveFileOnSignal(sys::Path(OutputFilename));
// Determine the locations of the llc and gcc programs. // Determine the locations of the llc and gcc programs.
std::string llc = FindExecutable("llc", argv[0]); std::string llc = FindExecutable("llc", argv[0]).toString();
std::string gcc = FindExecutable("gcc", argv[0]);
if (llc.empty()) if (llc.empty())
return PrintAndReturn(argv[0], "Failed to find llc"); return PrintAndReturn(argv[0], "Failed to find llc");
std::string gcc = FindExecutable("gcc", argv[0]).toString();
if (gcc.empty()) if (gcc.empty())
return PrintAndReturn(argv[0], "Failed to find gcc"); return PrintAndReturn(argv[0], "Failed to find gcc");
@ -308,10 +308,11 @@ int main(int argc, char **argv, char **envp) {
sys::RemoveFileOnSignal(sys::Path(OutputFilename)); sys::RemoveFileOnSignal(sys::Path(OutputFilename));
// Determine the locations of the llc and gcc programs. // Determine the locations of the llc and gcc programs.
std::string llc = FindExecutable("llc", argv[0]); std::string llc = FindExecutable("llc", argv[0]).toString();
std::string gcc = FindExecutable("gcc", argv[0]);
if (llc.empty()) if (llc.empty())
return PrintAndReturn(argv[0], "Failed to find llc"); return PrintAndReturn(argv[0], "Failed to find llc");
std::string gcc = FindExecutable("gcc", argv[0]).toString();
if (gcc.empty()) if (gcc.empty())
return PrintAndReturn(argv[0], "Failed to find gcc"); return PrintAndReturn(argv[0], "Failed to find gcc");

9
tools/llvm-ld/llvm-ld.cpp
View File

@ -481,11 +481,11 @@ int main(int argc, char **argv, char **envp) {
sys::RemoveFileOnSignal(sys::Path(OutputFilename)); sys::RemoveFileOnSignal(sys::Path(OutputFilename));
// Determine the locations of the llc and gcc programs. // Determine the locations of the llc and gcc programs.
std::string llc = FindExecutable("llc", argv[0]); std::string llc = FindExecutable("llc", argv[0]).toString();
std::string gcc = FindExecutable("gcc", argv[0]);
if (llc.empty()) if (llc.empty())
return PrintAndReturn("Failed to find llc"); return PrintAndReturn("Failed to find llc");
std::string gcc = FindExecutable("gcc", argv[0]).toString();
if (gcc.empty()) if (gcc.empty())
return PrintAndReturn("Failed to find gcc"); return PrintAndReturn("Failed to find gcc");
@ -506,10 +506,11 @@ int main(int argc, char **argv, char **envp) {
sys::RemoveFileOnSignal(sys::Path(OutputFilename)); sys::RemoveFileOnSignal(sys::Path(OutputFilename));
// Determine the locations of the llc and gcc programs. // Determine the locations of the llc and gcc programs.
std::string llc = FindExecutable("llc", argv[0]); std::string llc = FindExecutable("llc", argv[0]).toString();
std::string gcc = FindExecutable("gcc", argv[0]);
if (llc.empty()) if (llc.empty())
return PrintAndReturn("Failed to find llc"); return PrintAndReturn("Failed to find llc");
std::string gcc = FindExecutable("gcc", argv[0]).toString();
if (gcc.empty()) if (gcc.empty())
return PrintAndReturn("Failed to find gcc"); return PrintAndReturn("Failed to find gcc");