diff runtime/lib/llvmdc-posix.mak @ 569:926a03711ca8

Split runtime into three parts again.
author Christian Kamm <kamm incasoftware de>
date Wed, 03 Sep 2008 22:07:04 +0200
parents 2b28fd92bab8
children 20c065c46b38
line wrap: on
line diff
--- a/runtime/lib/llvmdc-posix.mak	Tue Sep 02 19:14:37 2008 +0200
+++ b/runtime/lib/llvmdc-posix.mak	Wed Sep 03 22:07:04 2008 +0200
@@ -37,8 +37,8 @@
 #ADD_DFLAGS=
 ADD_DFLAGS=-I`pwd`/common/
 
-targets : nativelib doc
-all     : nativelib lib doc
+targets : lib doc
+all     : lib doc
 
 ######################################################
 
@@ -54,29 +54,7 @@
 	make -C $(DIR_CC) -fllvmdc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
 	make -C $(DIR_RT) -fllvmdc.mak lib
 	make -C $(DIR_GC) -fllvmdc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-	find . -name $(LIB_MASK) | xargs $(RM)
-	$(LC) $(LIB_TARGET) `find $(DIR_CC) -name "*.bc" | xargs echo`
-	$(LC) $(LIB_TARGET) `find $(DIR_RT) -name "*.bc" | xargs echo`
-	$(LC) $(LIB_TARGET) `find $(DIR_GC) -name "*.bc" | xargs echo`
-	$(CLC) $(LIB_TARGET_C) `find $(DIR_CC) -name "*.o" | xargs echo`
-	$(CLC) $(LIB_TARGET_C) `find $(DIR_RT) -name "*.o" | xargs echo`
-
-nativelib: $(ALL_OBJS)
-	make -C $(DIR_CC) -fllvmdc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-	make -C $(DIR_RT) -fllvmdc.mak lib
-	make -C $(DIR_GC) -fllvmdc.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-
-	$(RM) $(LIB_NAME_NATIVE)*
-
-	# first link all bcs together to a single bitcode file
-	$(LLVMLINK) -o=$(LIB_NAME_NATIVE)-llvm.bc `find $(DIR_CC) $(DIR_RT) $(DIR_GC) -name "*.bc"`
-	# then compile to assembler
-	$(LLC) -o=$(LIB_NAME_NATIVE)-llvm.s $(LIB_NAME_NATIVE)-llvm.bc
-	# assemble native code
-	$(CC) -c -o $(LIB_NAME_NATIVE)-llvm.o $(LIB_NAME_NATIVE)-llvm.s
-	# make an archive containing it and the other native object files
-	$(CLC) $(LIB_TARGET_NATIVE) $(LIB_NAME_NATIVE)-llvm.o `find $(DIR_CC) $(DIR_RT) -name "*.o"`
-	
+	# could link the three parts into one here, but why should we
 
 doc : $(ALL_DOCS)
 	make -C $(DIR_CC) -fllvmdc.mak doc