diff tango/lib/common/tango/llvmdc.mak @ 133:44a95ac7368a trunk

[svn r137] Many fixes towards tango.io.Console working, but not quite there yet... In particular, assertions has been fixed to include file/line info, and much more!
author lindquist
date Mon, 14 Jan 2008 05:11:54 +0100
parents 1700239cab2e
children 0ab29b838084
line wrap: on
line diff
--- a/tango/lib/common/tango/llvmdc.mak	Fri Jan 11 17:57:40 2008 +0100
+++ b/tango/lib/common/tango/llvmdc.mak	Mon Jan 14 05:11:54 2008 +0100
@@ -12,6 +12,8 @@
 
 LIB_TARGET=libtango-cc-tango.a
 LIB_MASK=libtango-cc-tango*.a
+LIB_TARGET_C=libtango-cc-c-tango.a
+LIB_MASK_C=libtango-cc-c-tango*.a
 
 CP=cp -f
 RM=rm -f
@@ -33,6 +35,7 @@
 
 CC=gcc
 LC=llvm-ar rsv
+CLC=ar rsv
 DC=llvmdc
 LLC=llvm-as
 
@@ -68,7 +71,7 @@
 targets : lib doc
 all     : lib doc
 tango   : lib
-lib     : tango.lib
+lib     : tango.lib tango.clib
 doc     : tango.doc
 
 ######################################################
@@ -82,14 +85,15 @@
 #    core/ThreadASM.o
 
 OBJ_STDC= \
-    stdc/wrap.bc
+    stdc/wrap.o
+#    stdc/wrap.bc
 
 OBJ_STDC_POSIX= \
     stdc/posix/pthread_darwin.o
 
 ALL_OBJS= \
-    $(OBJ_CORE) \
-    $(OBJ_STDC)
+    $(OBJ_CORE)
+#    $(OBJ_STDC)
 #    $(OBJ_STDC_POSIX)
 
 ######################################################
@@ -112,6 +116,14 @@
 	$(RM) $@
 	$(LC) $@ $(ALL_OBJS)
 
+
+tango.clib : $(LIB_TARGET_C)
+
+$(LIB_TARGET_C) : $(OBJ_STDC)
+	$(RM) $@
+	$(CLC) $@ $(OBJ_STDC)
+
+
 tango.doc : $(ALL_DOCS)
 	echo Documentation generated.
 
@@ -127,8 +139,10 @@
 clean :
 	find . -name "*.di" | xargs $(RM)
 	$(RM) $(ALL_OBJS)
+	$(RM) $(OBJ_STDC)
 	$(RM) $(ALL_DOCS)
 	find . -name "$(LIB_MASK)" | xargs $(RM)
+	find . -name "$(LIB_MASK_C)" | xargs $(RM)
 
 install :
 	$(MD) $(INC_DEST)
@@ -137,3 +151,4 @@
 	find . -name "*.html" -exec cp -f {} $(DOC_DEST)/{} \;
 	$(MD) $(LIB_DEST)
 	find . -name "$(LIB_MASK)" -exec cp -f {} $(LIB_DEST)/{} \;
+	find . -name "$(LIB_MASK_C)" -exec cp -f {} $(LIB_DEST)/{} \;