Mercurial > projects > ldc

diff gen/linker.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 461a85f0db31
children 2bebd938548f
line wrap: on
line diff
--- a/gen/linker.cpp	Mon May 04 12:08:30 2009 +0200
+++ b/gen/linker.cpp	Mon May 04 13:32:16 2009 +0200
@@ -14,6 +14,7 @@
 #include "gen/logger.h"
 #include "gen/cl_options.h"
 #include "gen/optimizer.h"
+#include "gen/programs.h"
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -216,25 +217,16 @@
     // error string
     std::string errstr;
 
-    const char *cc;
-#if !_WIN32
-    cc = getenv("CC");
-    if (!cc)
-#endif
-	cc = "gcc";
-
     // find gcc for linking
-    llvm::sys::Path gcc = llvm::sys::Program::FindProgramByName(cc);
-    if (gcc.isEmpty())
-    {
-        gcc.set(cc);
-    }
+    llvm::sys::Path gcc = getGcc();
+    // get a string version for argv[0]
+    std::string gccStr = gcc.toString();
 
     // build arguments
     std::vector<const char*> args;
 
     // first the program name ??
-    args.push_back(cc);
+    args.push_back(gccStr.c_str());
 
     // object files
     for (int i = 0; i < global.params.objfiles->dim; i++)