Mercurial > projects > ldc
diff runtime/lib/common/tango/ldc.mak @ 679:dc078dd8d2e1
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/common/tango/ldc.mak Sat Oct 11 21:23:41 2008 +0200 +++ b/runtime/lib/common/tango/ldc.mak Sat Oct 11 21:40:44 2008 +0200 @@ -60,9 +60,11 @@ .cpp.o: g++ -c $(CFLAGS) $< -o$@ -.d.bc: +.d.o: $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@ -# $(DC) -c $(DFLAGS) $< -of$@ + +.d.bc: + $(DC) -c $(DFLAGS) -Hf$*.di $< -of$@ -output-bc .ll.bc: $(LLC) -f -o=$@ $< @@ -80,7 +82,7 @@ ###################################################### -OBJ_CORE= \ +OBJ_CORE_BC= \ core/BitManip.bc \ core/Exception.bc \ core/Memory.bc \ @@ -88,6 +90,13 @@ core/Thread.bc # core/ThreadASM.o +OBJ_CORE_O= \ + core/BitManip.o \ + core/Exception.o \ + core/Memory.o \ + core/Runtime.o \ + core/Thread.o + OBJ_STDC= \ stdc/wrap.o # stdc/wrap.bc @@ -95,11 +104,16 @@ OBJ_STDC_POSIX= \ stdc/posix/pthread_darwin.o -ALL_OBJS= \ - $(OBJ_CORE) +ALL_OBJS_BC= \ + $(OBJ_CORE_BC) # $(OBJ_STDC) # $(OBJ_STDC_POSIX) +ALL_OBJS_O= \ + $(OBJ_CORE_O) \ + $(OBJ_STDC) \ + $(OBJ_STDC_POSIX) + ###################################################### DOC_CORE= \ @@ -119,17 +133,14 @@ tango.clib : $(LIB_TARGET_C_ONLY) tango.sharedlib : $(LIB_TARGET_SHARED) -$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS) +$(LIB_TARGET_BC_ONLY) : $(ALL_OBJS_BC) $(RM) $@ - $(LC) $@ $(ALL_OBJS) + $(LC) $@ $(ALL_OBJS_BC) -$(LIB_TARGET_FULL) : $(ALL_OBJS) $(OBJ_STDC) - $(RM) $@ $@.bc $@.s $@.o - $(LLINK) -o=$@.bc $(ALL_OBJS) - $(LCC) -o=$@.s $@.bc - $(CC) -c -o $@.o $@.s - $(CLC) $@ $@.o $(OBJ_STDC) +$(LIB_TARGET_FULL) : $(ALL_OBJS_O) + $(RM) $@ + $(CLC) $@ $(ALL_OBJS_O) $(LIB_TARGET_C_ONLY) : $(OBJ_STDC) @@ -137,12 +148,9 @@ $(CLC) $@ $(OBJ_STDC) -$(LIB_TARGET_SHARED) : $(ALL_OBJS) $(OBJ_STDC) - $(RM) $@ $@.bc $@.s $@.o - $(LLINK) -o=$@.bc $(ALL_OBJS) - $(LCC) -relocation-model=pic -o=$@.s $@.bc - $(CC) -c -o $@.o $@.s - $(CC) -shared -o $@ $@.o $(OBJ_STDC) +$(LIB_TARGET_SHARED) : $(ALL_OBJS_O) + $(RM) $@ + $(CC) -shared -o $@ $(ALL_OBJS_O) tango.doc : $(ALL_DOCS)