Mercurial > projects > ldc

diff gen/toobj.cpp @ 1299:847b767b2d0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factor out the code to find gcc, and add a command-line option to override the default executable name. This should help cross-compilation by allowing a cross-gcc to be specified from the configuration file instead of only through the CC environment variable.
author Frits van Bommel <fvbommel wxs.nl>
date Mon, 04 May 2009 13:32:16 +0200
parents 00a307a393f2
children 681dd955c53b
line wrap: on
line diff
--- a/gen/toobj.cpp	Mon May 04 12:08:30 2009 +0200
+++ b/gen/toobj.cpp	Mon May 04 13:32:16 2009 +0200
@@ -18,7 +18,6 @@
 #include "llvm/PassManager.h"
 #include "llvm/LinkAllPasses.h"
 #include "llvm/System/Program.h"
-#include "llvm/System/Path.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Target/TargetMachine.h"
@@ -51,6 +50,7 @@
 #include "gen/cl_options.h"
 #include "gen/optimizer.h"
 #include "gen/llvm-version.h"
+#include "gen/programs.h"
 
 #include "ir/irvar.h"
 #include "ir/irmodule.h"
@@ -310,19 +310,7 @@
 {
     using namespace llvm;
 
-    const char *cc;
-#if !_WIN32
-    cc = getenv("CC");
-    if (!cc)
-#endif
-	cc = "gcc";
-
-    sys::Path gcc = llvm::sys::Program::FindProgramByName(cc);
-    if (gcc.empty())
-    {
-        error("failed to locate gcc");
-        fatal();
-    }
+    sys::Path gcc = getGcc();
 
     // Run GCC to assemble and link the program into native code.
     //