@@ -24,14 +24,9 @@ DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
24
24
25
25
UTFLAGS=-version =CoreUnittest -unittest -checkaction=context
26
26
27
- CFLAGS =/Z7
28
-
29
27
DRUNTIME_BASE =druntime$(MODEL )
30
28
DRUNTIME =lib\$(DRUNTIME_BASE ) .lib
31
29
32
- # do not preselect a C runtime (extracted from the line above to make the auto tester happy)
33
- CFLAGS =$(CFLAGS ) /Zl
34
-
35
30
DOCFMT =
36
31
37
32
target : copydir copy $(DRUNTIME )
59
54
# ################## C\ASM Targets ############################
60
55
61
56
errno_c_$(MODEL ) .obj : src\core\stdc\errno.c
62
- " $( CC ) " -c -Fo $@ $(CFLAGS ) src\c ore\s tdc\e rrno.c
57
+ $( DMD ) -c -of= $@ $(DFLAGS ) -v -P=-I. src\c ore\s tdc\e rrno.c
63
58
64
59
# ################## Library generation #########################
65
60
@@ -80,32 +75,32 @@ test_aa:
80
75
" $( DMD) " -m$(MODEL ) -conf= -Isrc -defaultlib=$(DRUNTIME ) -run test\a a\s rc\t est_aa.d
81
76
82
77
test_betterc :
83
- " $( MAKE) " -f test\b etterc\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
78
+ " $( MAKE) " -f test\b etterc\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
84
79
85
80
test_betterc_mingw :
86
- " $( MAKE) " -f test\b etterc\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " MINGW=_mingw test
81
+ " $( MAKE) " -f test\b etterc\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) MINGW=_mingw test
87
82
88
83
test_cpuid :
89
- " $( MAKE) " -f test\c puid\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
84
+ " $( MAKE) " -f test\c puid\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
90
85
91
86
test_exceptions :
92
- " $( MAKE) " -f test\e xceptions\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
87
+ " $( MAKE) " -f test\e xceptions\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
93
88
94
89
test_hash :
95
90
" $( DMD) " -m$(MODEL ) -conf= -Isrc -defaultlib=$(DRUNTIME ) -run test\h ash\s rc\t est_hash.d
96
91
97
92
test_stdcpp :
98
93
setmscver.bat
99
- " $( MAKE) " -f test\s tdcpp\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
94
+ " $( MAKE) " -f test\s tdcpp\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
100
95
101
96
test_gc :
102
- " $( MAKE) " -f test\g c\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
97
+ " $( MAKE) " -f test\g c\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
103
98
104
99
custom_gc :
105
- $(MAKE ) -f test\i nit_fini\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
100
+ $(MAKE ) -f test\i nit_fini\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
106
101
107
102
test_shared :
108
- $(MAKE ) -f test\s hared\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) " CC= $( CC ) " test
103
+ $(MAKE ) -f test\s hared\w in64.mak " DMD=$( DMD) " MODEL=$(MODEL ) DRUNTIMELIB=$(DRUNTIME ) test
109
104
110
105
test_common : test_shared test_aa test_cpuid test_exceptions test_hash test_gc custom_gc
111
106
0 commit comments