# HG changeset patch
# User Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
# Date 1217407520 -7200
# Node ID 11a8a45759a8b1dc465091b11d757265a57b3f9f
# Parent  657d37df25b0f027ceeb02a256eb0d6169b2201e
Reverted bad cfg merge stuff

diff -r 657d37df25b0 -r 11a8a45759a8 bin/llvmdc.conf
--- a/bin/llvmdc.conf	Wed Jul 30 10:41:31 2008 +0200
+++ b/bin/llvmdc.conf	Wed Jul 30 10:45:20 2008 +0200
@@ -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 -r 657d37df25b0 -r 11a8a45759a8 bin/llvmdc.ini
--- a/bin/llvmdc.ini	Wed Jul 30 10:41:31 2008 +0200
+++ b/bin/llvmdc.ini	Wed Jul 30 10:45:20 2008 +0200
@@ -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 -r 657d37df25b0 -r 11a8a45759a8 llvmdc-tango
--- a/llvmdc-tango	Wed Jul 30 10:41:31 2008 +0200
+++ b/llvmdc-tango	Wed Jul 30 10:45:20 2008 +0200
@@ -1,4 +1,4 @@
-#profile=tango
+profile=tango
 
 compiler=llvmdc
 inifile=llvmdc.conf
@@ -13,7 +13,7 @@
 noversion=GNU
 testversion=linux
 testversion=Unix
-testversion=Posix
+version=Posix
 testversion=Windows
 testversion=Win32
 testversion=Win64
@@ -29,7 +29,6 @@
 testversion=LittleEndian
 testversion=BigEndian
 testversion=LLVM64
-textversion=LLVM_X86_FP80
 
 
 [compile]
@@ -43,7 +42,7 @@
 
 
 [link]
-oneatatime=yes
+#oneatatime=yes
 cmd=llvmdc $i -of$o
 
 libdir=-L-L=$i
@@ -53,7 +52,7 @@
 
 [liblink]
 safe=yes
-oneatatime=yes
+#oneatatime=yes
 cmd=llvm-ar rsc $o $i
 
 libdir=-L=$i
@@ -62,8 +61,8 @@
 
 
 [postliblink]
-#cmd=llvm-ranlib $i
-cmd=
+#cmd=ranlib $i
+
 
 [shliblink]
 shlibs=no