From 323c45e76868276cd1ac943eeb253fab97f1e076 Mon Sep 17 00:00:00 2001 From: Tomas Lindquist Olsen Date: Mon, 4 Aug 2008 20:05:42 +0200 Subject: [PATCH] Added missing llvmdc-build script in lphobos, added llvmdc.conf to lphobos. --- lphobos/build.sh | 14 +++++++------- lphobos/llvmdc-build | 1 - lphobos/llvmdc.conf | 4 ++++ 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 lphobos/llvmdc.conf diff --git a/lphobos/build.sh b/lphobos/build.sh index 83ed5335..71ace88b 100755 --- a/lphobos/build.sh +++ b/lphobos/build.sh @@ -12,7 +12,7 @@ echo "compiling contract runtime" llvmdc internal/contract.d -c -of../lib/llvmdcore.bc || exit 1 #-noruntime || exit 1 echo "compiling common runtime" -llvmdc-build internal/arrays.d \ +./llvmdc-build internal/arrays.d \ internal/mem.d \ internal/critical.d \ internal/dmain2.d \ @@ -20,17 +20,17 @@ llvmdc-build internal/arrays.d \ mv *.bc obj echo "compiling typeinfo 1" -llvmdc-build typeinfos1.d $LLVMDCFLAGS || exit 1 +./llvmdc-build typeinfos1.d $LLVMDCFLAGS || exit 1 mv *.bc obj llvm-link -f -o=../lib/llvmdcore.bc `ls obj/typeinfo1.*.bc` ../lib/llvmdcore.bc || exit 1 echo "compiling typeinfo 2" -llvmdc-build typeinfos2.d $LLVMDCFLAGS || exit 1 +./llvmdc-build typeinfos2.d $LLVMDCFLAGS || exit 1 mv *.bc obj llvm-link -f -o=../lib/llvmdcore.bc `ls obj/typeinfo2.*.bc` ../lib/llvmdcore.bc || exit 1 echo "compiling exceptions" -llvmdc-build internal/eh.d $LLVMDCFLAGS -debug || exit 1 +./llvmdc-build internal/eh.d $LLVMDCFLAGS -debug || exit 1 mv *.bc obj llvm-link -f -o=../lib/llvmdcore.bc obj/*eh.bc ../lib/llvmdcore.bc || exit 1 @@ -62,7 +62,7 @@ llvmdc internal/objectimpl.d -c -odobj -g || exit 1 llvm-link -f -o=../lib/llvmdcore.bc obj/objectimpl.bc ../lib/llvmdcore.bc || exit 1 echo "compiling llvm runtime support" -llvmdc-build llvmsupport.d $LLVMDCFLAGS || exit 1 +./llvmdc-build llvmsupport.d $LLVMDCFLAGS || exit 1 mv *.bc obj llvm-link -f -o=../lib/llvmdcore.bc `ls obj/llvm.*.bc` ../lib/llvmdcore.bc || exit 1 @@ -79,13 +79,13 @@ cd .. llvm-link -f -o=../lib/llvmdcore.bc obj/gclinux.bc obj/gcx.bc obj/gcbits.bc obj/gc.bc ../lib/llvmdcore.bc || exit 1 echo "compiling phobos" -llvmdc-build phobos.d $LLVMDCFLAGS || exit 1 +./llvmdc-build phobos.d $LLVMDCFLAGS || exit 1 mv *.bc obj echo "linking phobos" llvm-link -f -o=../lib/llvmdcore.bc `ls obj/std.*.bc` ../lib/llvmdcore.bc || exit 1 echo "Compiling auxiliary" -llvmdc-build etc/c/zlib.d $LLVMDCFLAGS || exit 1 +./llvmdc-build etc/c/zlib.d $LLVMDCFLAGS || exit 1 mv *.bc obj llvm-link -f -o=../lib/llvmdcore.bc `ls obj/etc.*.bc` ../lib/llvmdcore.bc || exit 1 diff --git a/lphobos/llvmdc-build b/lphobos/llvmdc-build index 7c7794aa..8f2c1509 100755 --- a/lphobos/llvmdc-build +++ b/lphobos/llvmdc-build @@ -7,4 +7,3 @@ PARAM=$(for p_file in $($LLVMDC_PATH/bin/llvmdc $FILE -I~/llvmdc/lphobos -c -v - |sed -e "s/\./\//g" -e "s/$/\.d/"); do if [ -f $p_file ]; then echo $p_file; fi; done) echo llvmdc $FILE $@ $PARAM $LLVMDC_PATH/bin/llvmdc $FILE $@ $PARAM -Rebuild In A Shellscript diff --git a/lphobos/llvmdc.conf b/lphobos/llvmdc.conf new file mode 100644 index 00000000..67540fd4 --- /dev/null +++ b/lphobos/llvmdc.conf @@ -0,0 +1,4 @@ + +[Environment] + +DFLAGS=-I%@P%/../lphobos -I%@P%/../import -L-L%@P%/../lib -R%@P%/../lib