From dfaba71dcecd3387d12632bf6d5db544e2979b5e Mon Sep 17 00:00:00 2001
From: Christian Kamm <kamm@incasoftware.de>
Date: Sun, 10 May 2009 18:14:36 +0200
Subject: [PATCH] Fix the ldcbinarypath config file rewriting.

---
 gen/configfile.cpp | 10 +++++-----
 ldc.conf.in        |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gen/configfile.cpp b/gen/configfile.cpp
index 3459d6a1..209421c3 100644
--- a/gen/configfile.cpp
+++ b/gen/configfile.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <string>
 #include <cassert>
-#include <string.h>
+#include <cstring>
 
 #include "llvm/System/Path.h"
 
@@ -85,6 +85,9 @@ bool ConfigFile::read(const char* argv0, void* mainAddr, const char* filename)
         // handle switches
         if (root.exists("switches"))
         {
+            std::string binpathkey = "%%ldcbinarypath%%";
+            std::string binpath = sys::Path::GetMainExecutable(argv0, mainAddr).getDirname();
+
             libconfig::Setting& arr = cfg->lookup("default.switches");
             int len = arr.getLength();
             for (int i=0; i<len; i++)
@@ -92,13 +95,10 @@ bool ConfigFile::read(const char* argv0, void* mainAddr, const char* filename)
                 std::string v = arr[i];
                 
                 // replace binpathkey with binpath
-                std::string binpathkey = "%%ldcbinarypath%%";
-                sys::Path binpathgetter = sys::Path::GetMainExecutable(argv0, mainAddr);
-                binpathgetter.eraseComponent();
-                std::string binpath = binpathgetter.toString();
                 size_t p;
                 while (std::string::npos != (p = v.find(binpathkey)))
                     v.replace(p, binpathkey.size(), binpath);
+                
                 switches.push_back(strdup(v.c_str()));
             }
         }
diff --git a/ldc.conf.in b/ldc.conf.in
index cb7db01c..6c5a7aba 100644
--- a/ldc.conf.in
+++ b/ldc.conf.in
@@ -9,7 +9,7 @@ default:
     switches = [
         "-I@RUNTIME_DIR@",
         "-I@RUNTIME_DIR@/lib/common",
-        "-L-L%%ldcbinarydir%%/../lib",
+        "-L-L%%ldcbinarypath%%/../lib",
         "-d-version=Tango",
         "-defaultlib=@RUNTIME_AIO@",
         "-debuglib=@RUNTIME_AIO@"