restored support for setting gc handle

[software/druntime.git] / src / dmd-posix.mak

diff --git a/src/dmd-posix.mak b/src/dmd-posix.mak
index dce94e2fefeb1f062eea9972fb4e14cda7474577..6b567c888f63b285ea71327df812f71c98d3c754 100644 (file)
--- a/src/dmd-posix.mak
+++ b/src/dmd-posix.mak
@@ -11,11 +11,12 @@
 #              Delete unneeded files created by build process
 
 LIB_TARGET=libdruntime-dmd.a
-LIB_MASK=libdruntime-dmd*.a
+DUP_TARGET=libdruntime.a
+LIB_MASK=libdruntime*.a
 
-DIR_CC=../src/core
-DIR_RT=../src/compiler/dmd
-DIR_GC=../src/gc/basic
+DIR_CC=common
+DIR_RT=compiler/dmd
+DIR_GC=gc/basic
 
 CP=cp -f
 RM=rm -f
@@ -47,10 +48,12 @@ lib : $(ALL_OBJS)
        make -C $(DIR_CC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
        make -C $(DIR_RT) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
        make -C $(DIR_GC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"
-       find . -name "libphobos*.a" | xargs $(RM)
+       $(RM) $(LIB_TARGET)
        $(LC) $(LIB_TARGET) `find $(DIR_CC) -name "*.o" | xargs echo`
        $(LC) $(LIB_TARGET) `find $(DIR_RT) -name "*.o" | xargs echo`
        $(LC) $(LIB_TARGET) `find $(DIR_GC) -name "*.o" | xargs echo`
+       $(RM) $(DUP_TARGET)
+       $(CP) $(LIB_TARGET) $(DUP_TARGET)
 
 doc : $(ALL_DOCS)
        make -C $(DIR_CC) -fposix.mak doc DC=$(DC)