Mercurial > projects > ldc
changeset 437:11a8a45759a8
Reverted bad cfg merge stuff
| author | Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> |
|---|---|
| date | Wed, 30 Jul 2008 10:45:20 +0200 |
| parents | 657d37df25b0 |
| children | 3c133dd1eda3 |
| files | bin/llvmdc.conf bin/llvmdc.ini llvmdc-tango |
| diffstat | 3 files changed, 7 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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