Mercurial > projects > ldc

diff runtime/lib/gc/basic/ldc.mak @ 679:dc078dd8d2e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix remaining make files. Fix linking order for static libs.
author Christian Kamm <kamm incasoftware de>
date Sat, 11 Oct 2008 21:40:44 +0200
parents d8a1481eaa0c
children f1560a529987
line wrap: on
line diff
--- a/runtime/lib/gc/basic/ldc.mak	Sat Oct 11 21:23:41 2008 +0200
+++ b/runtime/lib/gc/basic/ldc.mak	Sat Oct 11 21:40:44 2008 +0200
@@ -58,6 +58,9 @@
 	g++ -c $(CFLAGS) $< -o$@
 
 .d.bc:
+	$(DC) -c $(DFLAGS) $< -of$@ -output-bc
+
+.d.o:
 	$(DC) -c $(DFLAGS) $< -of$@
 
 .d.html:
@@ -72,13 +75,20 @@
 
 ######################################################
 
-ALL_OBJS= \
+ALL_OBJS_BC= \
     gc.bc \
     gcalloc.bc \
     gcbits.bc \
     gcstats.bc \
     gcx.bc
 
+ALL_OBJS_O= \
+    gc.o \
+    gcalloc.o \
+    gcbits.o \
+    gcstats.o \
+    gcx.o
+
 ######################################################
 
 ALL_DOCS=
@@ -89,24 +99,19 @@
 basic.nlib : $(LIB_TARGET_NATIVE)
 basic.sharedlib : $(LIB_TARGET_SHARED)
 
-$(LIB_TARGET_BC) : $(ALL_OBJS)
+$(LIB_TARGET_BC) : $(ALL_OBJS_BC)
 	$(RM) $@
-	$(LC) $@ $(ALL_OBJS)
+	$(LC) $@ $(ALL_OBJS_BC)
 
 
-$(LIB_TARGET_NATIVE) : $(ALL_OBJS)
-	$(RM) $@ $@.bc $@.s $@.o
-	$(LLINK) -o=$@.bc $(ALL_OBJS)
-	$(LCC) -o=$@.s $@.bc
-	$(CC) -c -o $@.o $@.s
-	$(CLC) $@ $@.o
+$(LIB_TARGET_NATIVE) : $(ALL_OBJS_O)
+	$(RM) $@
+	$(CLC) $@ $(ALL_OBJS_O)
 
 
-$(LIB_TARGET_SHARED) : $(ALL_OBJS)
-	$(RM) $@ $@.bc $@.s $@.o
-	$(LLINK) -o=$@.bc $(ALL_OBJS)
-	$(LCC) -relocation-model=pic -o=$@.s $@.bc
-	$(CC) -shared -o $@ $@.s
+$(LIB_TARGET_SHARED) : $(ALL_OBJS_O)
+	$(RM) $@
+	$(CC) -shared -o $@ $(ALL_OBJS_O)
 
 basic.doc : $(ALL_DOCS)
 	echo No documentation available.