Reverted bad cfg merge stuff

This commit is contained in:
Tomas Lindquist Olsen
2008-07-30 10:45:20 +02:00
parent 660290f640
commit a8bf4e9579
3 changed files with 7 additions and 19 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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