Mercurial > projects > ldc

changeset 890:5a03f3f74615

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Apply afb's patch from #168 to use $CC instead of "gcc" for toobj and linker.
author Christian Kamm <kamm incasoftware de>
date Sat, 17 Jan 2009 17:52:09 +0100
parents d2d6107e4ec2
children ea82e2077f9d
files gen/linker.cpp gen/toobj.cpp
diffstat 2 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gen/linker.cpp	Sat Jan 17 17:44:54 2009 +0100
+++ b/gen/linker.cpp	Sat Jan 17 17:52:09 2009 +0100
@@ -204,18 +204,25 @@
     // 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("gcc");
+    llvm::sys::Path gcc = llvm::sys::Program::FindProgramByName(cc);
     if (gcc.isEmpty())
     {
-        gcc.set("gcc");
+        gcc.set(cc);
     }
 
     // build arguments
     std::vector<const char*> args;
 
     // first the program name ??
-    args.push_back("gcc");
+    args.push_back(cc);
 
     // object files
     for (int i = 0; i < global.params.objfiles->dim; i++)
--- a/gen/toobj.cpp	Sat Jan 17 17:44:54 2009 +0100
+++ b/gen/toobj.cpp	Sat Jan 17 17:52:09 2009 +0100
@@ -326,7 +326,14 @@
 {
     using namespace llvm;
 
-    sys::Path gcc = llvm::sys::Program::FindProgramByName("gcc");
+    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");