Fixed import path override for library build on posix.

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

diff --git a/src/dmd-posix.mak b/src/dmd-posix.mak
index da9cb9de3a8f583375464c2633057a978be51125..dce94e2fefeb1f062eea9972fb4e14cda7474577 100644 (file)
--- a/src/dmd-posix.mak
+++ b/src/dmd-posix.mak
@@ -1,75 +1,75 @@
-# Makefile to build the composite D runtime library for Linux\r
-# Designed to work with GNU make\r
-# Targets:\r
-#      make\r
-#              Same as make all\r
-#      make lib\r
-#              Build the runtime library\r
-#   make doc\r
-#       Generate documentation\r
-#      make clean\r
-#              Delete unneeded files created by build process\r
-\r
-LIB_TARGET=libdruntime-dmd.a\r
-LIB_MASK=libdruntime-dmd*.a\r
-\r
-DIR_CC=../src/core\r
-DIR_RT=../src/compiler/dmd\r
-DIR_GC=../src/gc/basic\r
-\r
-CP=cp -f\r
-RM=rm -f\r
-MD=mkdir -p\r
-\r
-CC=gcc\r
-LC=$(AR) -qsv\r
-DC=dmd\r
-\r
-LIB_DEST=../lib\r
-\r
-ADD_CFLAGS=-m32\r
-ADD_DFLAGS=\r
-\r
-targets : lib doc\r
-all     : lib doc\r
-\r
-######################################################\r
-\r
-ALL_OBJS=\r
-\r
-######################################################\r
-\r
-ALL_DOCS=\r
-\r
-######################################################\r
-\r
-lib : $(ALL_OBJS)\r
-       make -C $(DIR_CC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"\r
-       make -C $(DIR_RT) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"\r
-       make -C $(DIR_GC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)"\r
-       find . -name "libphobos*.a" | xargs $(RM)\r
-       $(LC) $(LIB_TARGET) `find $(DIR_CC) -name "*.o" | xargs echo`\r
-       $(LC) $(LIB_TARGET) `find $(DIR_RT) -name "*.o" | xargs echo`\r
-       $(LC) $(LIB_TARGET) `find $(DIR_GC) -name "*.o" | xargs echo`\r
-\r
-doc : $(ALL_DOCS)\r
-       make -C $(DIR_CC) -fposix.mak doc DC=$(DC)\r
-       make -C $(DIR_RT) -fposix.mak doc DC=$(DC)\r
-       make -C $(DIR_GC) -fposix.mak doc DC=$(DC)\r
-\r
-######################################################\r
-\r
-clean :\r
-       find . -name "*.di" | xargs $(RM)\r
-       $(RM) $(ALL_OBJS)\r
-       $(RM) $(ALL_DOCS)\r
-       make -C $(DIR_CC) -fposix.mak clean\r
-       make -C $(DIR_RT) -fposix.mak clean\r
-       make -C $(DIR_GC) -fposix.mak clean\r
-       $(RM) $(LIB_MASK)\r
-\r
-install :\r
-       make -C $(DIR_CC) -fposix.mak install\r
-       make -C $(DIR_RT) -fposix.mak install\r
-       make -C $(DIR_GC) -fposix.mak install\r
-       $(CP) $(LIB_MASK) $(LIB_DEST)/.\r
+# Makefile to build the composite D runtime library for Linux
+# Designed to work with GNU make
+# Targets:
+#      make
+#              Same as make all
+#      make lib
+#              Build the runtime library
+#   make doc
+#       Generate documentation
+#      make clean
+#              Delete unneeded files created by build process
+
+LIB_TARGET=libdruntime-dmd.a
+LIB_MASK=libdruntime-dmd*.a
+
+DIR_CC=../src/core
+DIR_RT=../src/compiler/dmd
+DIR_GC=../src/gc/basic
+
+CP=cp -f
+RM=rm -f
+MD=mkdir -p
+
+CC=gcc
+LC=$(AR) -qsv
+DC=dmd
+
+LIB_DEST=../lib
+
+ADD_CFLAGS=-m32
+ADD_DFLAGS=
+
+targets : lib doc
+all     : lib doc
+
+######################################################
+
+ALL_OBJS=
+
+######################################################
+
+ALL_DOCS=
+
+######################################################
+
+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)
+       $(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`
+
+doc : $(ALL_DOCS)
+       make -C $(DIR_CC) -fposix.mak doc DC=$(DC)
+       make -C $(DIR_RT) -fposix.mak doc DC=$(DC)
+       make -C $(DIR_GC) -fposix.mak doc DC=$(DC)
+
+######################################################
+
+clean :
+       find . -name "*.di" | xargs $(RM)
+       $(RM) $(ALL_OBJS)
+       $(RM) $(ALL_DOCS)
+       make -C $(DIR_CC) -fposix.mak clean
+       make -C $(DIR_RT) -fposix.mak clean
+       make -C $(DIR_GC) -fposix.mak clean
+       $(RM) $(LIB_MASK)
+
+install :
+       make -C $(DIR_CC) -fposix.mak install
+       make -C $(DIR_RT) -fposix.mak install
+       make -C $(DIR_GC) -fposix.mak install
+       $(CP) $(LIB_MASK) $(LIB_DEST)/.