* Removed "-debug" from the list of debug build flags. The purpose of debug builds...

* Fixed an edit error that would have broken unit testing of druntime in trunk.

git-svn-id: http://svn.dsource.org/projects/druntime/trunk@48 4a9d5153-6564-4b3f-b5e1-7e8e9dac548f

diff --git a/src/common/posix.mak b/src/common/posix.mak
index 6653e0e141dcb66e62c74d8b0d2cad8229b4edc9..22bb3a9765b154bc55cdd42a0f058d5da8277096 100644 (file)
--- a/src/common/posix.mak
+++ b/src/common/posix.mak
@@ -27,11 +27,11 @@ CFLAGS_DEBUG=-g $(ADD_CFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)\r
 \r
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r
 CFLAGS=$(CFLAGS_RELEASE)\r
 \r
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)\r
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r

 DFLAGS=$(DFLAGS_RELEASE)\r
 \r
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r
 DFLAGS=$(DFLAGS_RELEASE)\r
 \r
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)\r
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r

 TFLAGS=$(TFLAGS_RELEASE)\r
 \r
 DOCFLAGS=-version=DDoc\r
 TFLAGS=$(TFLAGS_RELEASE)\r
 \r
 DOCFLAGS=-version=DDoc\r

diff --git a/src/common/win32.mak b/src/common/win32.mak
index 4554680fe3051eb74fa1dae077d464798bb5a271..b05948a8fb91c290b7546ea1b76109b6294db33e 100644 (file)
--- a/src/common/win32.mak
+++ b/src/common/win32.mak
@@ -23,15 +23,15 @@ ADD_CFLAGS=
 ADD_DFLAGS=\r
 \r
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)\r
 ADD_DFLAGS=\r
 \r
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)\r

-CFLAGS_DEBUG=-D -g -mn -6 -r $(ADD_CFLAGS)\r
+CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)\r

 CFLAGS=$(CFLAGS_RELEASE)\r
 \r
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r
 CFLAGS=$(CFLAGS_RELEASE)\r
 \r
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)\r

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)\r
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r

 DFLAGS=$(DFLAGS_RELEASE)\r
 \r
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r
 DFLAGS=$(DFLAGS_RELEASE)\r
 \r
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)\r

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)\r
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)\r

 TFLAGS=$(TFLAGS_RELEASE)\r
 \r
 DOCFLAGS=-version=DDoc\r
 TFLAGS=$(TFLAGS_RELEASE)\r
 \r
 DOCFLAGS=-version=DDoc\r

diff --git a/src/compiler/dmd/posix.mak b/src/compiler/dmd/posix.mak
index 9ca608d46f140060bfe40915b2cd6fdb726b84c7..dcec213ea51777d0e864ca1852f62fc5596f060b 100644 (file)
--- a/src/compiler/dmd/posix.mak
+++ b/src/compiler/dmd/posix.mak
@@ -27,11 +27,11 @@ CFLAGS_DEBUG=-g $(ADD_CFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc

diff --git a/src/compiler/dmd/win32.mak b/src/compiler/dmd/win32.mak
index 3694cd83d25527af294cc04f6e05467ad6117fb0..dc9ae28bd3d02fc238ea787987bbe084475bbb12 100644 (file)
--- a/src/compiler/dmd/win32.mak
+++ b/src/compiler/dmd/win32.mak
@@ -23,15 +23,15 @@ ADD_CFLAGS=
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)

-CFLAGS_DEBUG=-D -g -mn -6 -r $(ADD_CFLAGS)
+CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)

 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc

diff --git a/src/dmd-posix.mak b/src/dmd-posix.mak
index 0f5671565df29856eed36e95f2f324ed9b11b365..e90d2c3be69566d471fcd05fbf053aaef014a8bb 100644 (file)
--- a/src/dmd-posix.mak
+++ b/src/dmd-posix.mak
@@ -50,9 +50,9 @@ ALL_DOCS=
 
 unittest :
        make -fdmd-posix.mak lib MAKE_LIB="unittest"
 
 unittest :
        make -fdmd-posix.mak lib MAKE_LIB="unittest"

-       dmd -unittest main ../import/core/stdc/stdarg -defaultlib="$(DUP_TARGET)" -debuglib="$(DUP_TARGET)"
+       dmd -unittest unittest ../import/core/stdc/stdarg -defaultlib="$(DUP_TARGET)" -debuglib="$(DUP_TARGET)"

        $(RM) stdarg.o
        $(RM) stdarg.o

-       main
+       unittest

 
 release :
        make -fdmd-posix.mak lib MAKE_LIB="release"
 
 release :
        make -fdmd-posix.mak lib MAKE_LIB="release"


@@ -89,7 +89,7 @@ clean :
        make -C $(DIR_GC) -fposix.mak clean
        $(RM) $(LIB_MASK)
        $(RM) $(DUP_MASK)
        make -C $(DIR_GC) -fposix.mak clean
        $(RM) $(LIB_MASK)
        $(RM) $(DUP_MASK)

-       $(RM) main main.o
+       $(RM) unittest unittest.o

 
 install :
        make -C $(DIR_CC) -fposix.mak install
 
 install :
        make -C $(DIR_CC) -fposix.mak install

diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index f79f02fa47c57af603bd4f4b38ca9cc924d096c7..c2f18bb5bdd7426a619c95d14e2dad223c12d140 100644 (file)
--- a/src/dmd-win32.mak
+++ b/src/dmd-win32.mak
@@ -55,9 +55,9 @@ ALL_DOCS=
 
 unittest :
        make -fdmd-win32.mak lib MAKE_LIB="unittest"
 
 unittest :
        make -fdmd-win32.mak lib MAKE_LIB="unittest"

-       dmd -unittest main ..\import\core\stdc\stdarg -defaultlib="$(DUP_TARGET)" -debuglib="$(DUP_TARGET)"
+       dmd -unittest unittest ..\import\core\stdc\stdarg -defaultlib="$(DUP_TARGET)" -debuglib="$(DUP_TARGET)"

        $(RM) stdarg.obj
        $(RM) stdarg.obj

-       main
+       unittest

 
 release :
        make -fdmd-win32.mak lib MAKE_LIB="release"
 
 release :
        make -fdmd-win32.mak lib MAKE_LIB="release"


@@ -120,7 +120,7 @@ clean :
        cd ..\..
        $(RM) $(LIB_MASK)
        $(RM) $(DUP_MASK)
        cd ..\..
        $(RM) $(LIB_MASK)
        $(RM) $(DUP_MASK)

-       $(RM) main.exe main.obj main.map
+       $(RM) unittest.exe unittest.obj unittest.map

 
 install :
        cd $(DIR_CC)
 
 install :
        cd $(DIR_CC)

diff --git a/src/gc/basic/posix.mak b/src/gc/basic/posix.mak
index adf99424daa007e1710b4ca4df6b188681cc86bc..0021e9cf59ab61ead2bf4ff6a7092708c0ba4d4f 100644 (file)
--- a/src/gc/basic/posix.mak
+++ b/src/gc/basic/posix.mak
@@ -27,11 +27,11 @@ CFLAGS_DEBUG=-g $(ADD_CFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc

diff --git a/src/gc/basic/win32.mak b/src/gc/basic/win32.mak
index ac81683ca92ebf7e22414733ac6515e9e7e528fd..8bbc490f722ff69bb800098bb38da2b9cf34100b 100644 (file)
--- a/src/gc/basic/win32.mak
+++ b/src/gc/basic/win32.mak
@@ -23,15 +23,15 @@ ADD_CFLAGS=
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)

-CFLAGS_DEBUG=-D -g -mn -6 -r $(ADD_CFLAGS)
+CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)

 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc

diff --git a/src/gc/stub/posix.mak b/src/gc/stub/posix.mak
index 48681e3560f87296c451f4d4ee9da035a6077286..0e1f3d146e7f80de23814cf4a559856aa66c1e44 100644 (file)
--- a/src/gc/stub/posix.mak
+++ b/src/gc/stub/posix.mak
@@ -27,11 +27,11 @@ CFLAGS_DEBUG=-g $(ADD_CFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc

diff --git a/src/gc/stub/win32.mak b/src/gc/stub/win32.mak
index e55472e28413e870a4ffca44d739bdc104101b30..b412be452e6ba1f812e0924b8b4f8a2ef8e62f93 100644 (file)
--- a/src/gc/stub/win32.mak
+++ b/src/gc/stub/win32.mak
@@ -23,15 +23,15 @@ ADD_CFLAGS=
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)
 ADD_DFLAGS=
 
 CFLAGS_RELEASE=-mn -6 -r $(ADD_CFLAGS)

-CFLAGS_DEBUG=-D -g -mn -6 -r $(ADD_CFLAGS)
+CFLAGS_DEBUG=-g -mn -6 -r $(ADD_CFLAGS)

 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)
 CFLAGS=$(CFLAGS_RELEASE)
 
 DFLAGS_RELEASE=-release -O -inline -w -nofloat $(ADD_DFLAGS)

-DFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+DFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)
 DFLAGS=$(DFLAGS_RELEASE)
 
 TFLAGS_RELEASE=-O -inline -w  -nofloat $(ADD_DFLAGS)

-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)

 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc