@@ -24,14 +24,9 @@ DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc
2424
2525UTFLAGS=-version =CoreUnittest -unittest -checkaction=context
2626
27- CFLAGS =/Z7
28-
2927DRUNTIME_BASE =druntime$(MODEL )
3028DRUNTIME =lib\$(DRUNTIME_BASE ) .lib
3129
32- # do not preselect a C runtime (extracted from the line above to make the auto tester happy)
33- CFLAGS =$(CFLAGS ) /Zl
34-
3530DOCFMT =
3631
3732target : copydir copy $(DRUNTIME )
5954# ################## C\ASM Targets ############################
6055
6156errno_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
6358
6459# ################## Library generation #########################
6560
@@ -80,32 +75,32 @@ test_aa:
8075 " $( DMD) " -m$(MODEL ) -conf= -Isrc -defaultlib=$(DRUNTIME ) -run test\a a\s rc\t est_aa.d
8176
8277test_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
8479
8580test_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
8782
8883test_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
9085
9186test_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
9388
9489test_hash :
9590 " $( DMD) " -m$(MODEL ) -conf= -Isrc -defaultlib=$(DRUNTIME ) -run test\h ash\s rc\t est_hash.d
9691
9792test_stdcpp :
9893 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
10095
10196test_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
10398
10499custom_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
106101
107102test_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
109104
110105test_common : test_shared test_aa test_cpuid test_exceptions test_hash test_gc custom_gc
111106
0 commit comments