From a8bf4e957945dd15bf22ea5287ab891b844d84d1 Mon Sep 17 00:00:00 2001
From: Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
Date: Wed, 30 Jul 2008 10:45:20 +0200
Subject: [PATCH] Reverted bad cfg merge stuff

---
 bin/llvmdc.conf |  2 +-
 bin/llvmdc.ini  | 11 -----------
 llvmdc-tango    | 13 ++++++-------
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/bin/llvmdc.conf b/bin/llvmdc.conf
index cf8a8774..5434415f 100644
--- a/bin/llvmdc.conf
+++ b/bin/llvmdc.conf
@@ -1,4 +1,4 @@
 
 [Environment]
 
-DFLAGS=-I%@P%/../tango-llvmdc -I%@P%/../tango-llvmdc/lib/common -L-L%@P%/../lib -R%@P%/../lib
+DFLAGS=-I%@P%/../tango -L-L%@P%/../lib -R%@P%/../lib
diff --git a/bin/llvmdc.ini b/bin/llvmdc.ini
index 28a7a867..4c686d54 100644
--- a/bin/llvmdc.ini
+++ b/bin/llvmdc.ini
@@ -1,13 +1,2 @@
 [Environment]
-<<<<<<< local
-<<<<<<< local
-
-DFLAGS=-I%@P%/../tango-llvmdc -L-L%@P%/../lib -R%@P%/../lib
-=======
-=======
->>>>>>> other
 DFLAGS=-I%@P%/../tango -R%@P%/../lib
-<<<<<<< local
->>>>>>> other
-=======
->>>>>>> other
diff --git a/llvmdc-tango b/llvmdc-tango
index 97108535..c83ccfcb 100644
--- a/llvmdc-tango
+++ b/llvmdc-tango
@@ -1,4 +1,4 @@
-#profile=tango
+profile=tango
 
 compiler=llvmdc
 inifile=llvmdc.conf
@@ -13,7 +13,7 @@ noversion=DigitalMars
 noversion=GNU
 testversion=linux
 testversion=Unix
-testversion=Posix
+version=Posix
 testversion=Windows
 testversion=Win32
 testversion=Win64
@@ -29,7 +29,6 @@ testversion=D_InlineAsm_PPC64
 testversion=LittleEndian
 testversion=BigEndian
 testversion=LLVM64
-textversion=LLVM_X86_FP80
 
 
 [compile]
@@ -43,7 +42,7 @@ version=-version=$i
 
 
 [link]
-oneatatime=yes
+#oneatatime=yes
 cmd=llvmdc $i -of$o
 
 libdir=-L-L=$i
@@ -53,7 +52,7 @@ flag=-L$i
 
 [liblink]
 safe=yes
-oneatatime=yes
+#oneatatime=yes
 cmd=llvm-ar rsc $o $i
 
 libdir=-L=$i
@@ -62,8 +61,8 @@ flag=$i
 
 
 [postliblink]
-#cmd=llvm-ranlib $i
-cmd=
+#cmd=ranlib $i
+
 
 [shliblink]
 shlibs=no