From 9e5b0e79e2b282044571d7978c52ce10d6d703ce Mon Sep 17 00:00:00 2001
From: Kelly Wilson <wilsonk@cpsc.ucalgary.ca>
Date: Tue, 26 Apr 2011 09:16:33 -0600
Subject: [PATCH] Fix up ldc.conf to reflect newer naming convention for tango
 lib.

---
 ldc.conf.in            | 3 +--
 runtime/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ldc.conf.in b/ldc.conf.in
index 6837267c..d296c392 100644
--- a/ldc.conf.in
+++ b/ldc.conf.in
@@ -12,10 +12,9 @@ default:
     // arguments before they are parsed.
     switches = [
         "-I@RUNTIME_DIR@",
-        "-I@RUNTIME_DIR@/user",
-        "-I@RUNTIME_DIR@/lib/common",
         "-I@RUNTIME_DIR@/tango/core/vendor",
         "-L-L%%ldcbinarypath%%/../lib",
+        "-L-ltango",
         "-d-version=Tango",
         "-defaultlib=@RUNTIME_AIO@",
         "-debuglib=@RUNTIME_AIO@"
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index f05c7861..325b6e0c 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -50,7 +50,7 @@ if(D_VERSION EQUAL 1)
 	set(RUNTIME_CC tango-cc-tango)
 	set(RUNTIME_GC tango-gc-basic)
 	set(RUNTIME_DC ldc-runtime)
-	set(RUNTIME_AIO tango-user-ldc)
+	set(RUNTIME_AIO tango)
 	# set paths to source files, or fill lists directly
 	set(RUNTIME_DC_DIR ${PROJECT_SOURCE_DIR}/internal)
 	set(RUNTIME_GC_DIR ${RUNTIME_DIR}/lib/gc/basic)