From b4e307abd5e0e6f29d5726ac65878db14c4f07ae Mon Sep 17 00:00:00 2001
From: sean <sean@4a9d5153-6564-4b3f-b5e1-7e8e9dac548f>
Date: Fri, 21 Nov 2008 23:08:16 +0000
Subject: [PATCH] * Removed "-debug" from the list of debug build flags.  The
 purpose of debug builds is to test user code, not library code. * 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
---
 src/common/posix.mak       | 4 ++--
 src/common/win32.mak       | 6 +++---
 src/compiler/dmd/posix.mak | 4 ++--
 src/compiler/dmd/win32.mak | 6 +++---
 src/dmd-posix.mak          | 6 +++---
 src/dmd-win32.mak          | 6 +++---
 src/gc/basic/posix.mak     | 4 ++--
 src/gc/basic/win32.mak     | 6 +++---
 src/gc/stub/posix.mak      | 4 ++--
 src/gc/stub/win32.mak      | 6 +++---
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/common/posix.mak b/src/common/posix.mak
index 6653e0e..22bb3a9 100644
--- a/src/common/posix.mak
+++ b/src/common/posix.mak
@@ -27,11 +27,11 @@ CFLAGS_DEBUG=-g $(ADD_CFLAGS)
 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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/common/win32.mak b/src/common/win32.mak
index 4554680..b05948a 100644
--- a/src/common/win32.mak
+++ b/src/common/win32.mak
@@ -23,15 +23,15 @@ 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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/compiler/dmd/posix.mak b/src/compiler/dmd/posix.mak
index 9ca608d..dcec213 100644
--- 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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/compiler/dmd/win32.mak b/src/compiler/dmd/win32.mak
index 3694cd8..dc9ae28 100644
--- 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)
-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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/dmd-posix.mak b/src/dmd-posix.mak
index 0f56715..e90d2c3 100644
--- 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"
-	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
-	main
+	unittest
 
 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)
-	$(RM) main main.o
+	$(RM) unittest unittest.o
 
 install :
 	make -C $(DIR_CC) -fposix.mak install
diff --git a/src/dmd-win32.mak b/src/dmd-win32.mak
index f79f02f..c2f18bb 100644
--- 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"
-	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
-	main
+	unittest
 
 release :
 	make -fdmd-win32.mak lib MAKE_LIB="release"
@@ -120,7 +120,7 @@ clean :
 	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)
diff --git a/src/gc/basic/posix.mak b/src/gc/basic/posix.mak
index adf9942..0021e9c 100644
--- 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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/gc/basic/win32.mak b/src/gc/basic/win32.mak
index ac81683..8bbc490 100644
--- 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)
-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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/gc/stub/posix.mak b/src/gc/stub/posix.mak
index 48681e3..0e1f3d1 100644
--- 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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
diff --git a/src/gc/stub/win32.mak b/src/gc/stub/win32.mak
index e55472e..b412be4 100644
--- 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)
-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)
-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)
-TFLAGS_DEBUG=-debug -g -w -nofloat $(ADD_DFLAGS)
+TFLAGS_DEBUG=-g -w -nofloat $(ADD_DFLAGS)
 TFLAGS=$(TFLAGS_RELEASE)
 
 DOCFLAGS=-version=DDoc
-- 
2.43.0