Merge pull request #1358 from MartinNowak/m32mscoff

fix -m32mscoff issue with errno_c.obj
dlang · Aug 27, 2015 · 075a160 · 075a160
2 parents 0ca2564 + 1b6774d
commit 075a160
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/win32.mak b/win32.mak
@@ -34,8 +34,8 @@ $(mak\SRCS)
 # NOTE: a pre-compiled minit.obj has been provided in dmd for Win32 and
 #       minit.asm is not used by dmd for Linux
 
-OBJS= errno_c.obj src\rt\minit.obj
-OBJS_TO_DELETE= errno_c.obj
+OBJS= errno_c$(MODEL).obj src\rt\minit.obj
+OBJS_TO_DELETE= errno_c$(MODEL).obj
 
 ######################## Doc .html file generation ##############################
 
@@ -630,8 +630,8 @@ $(IMPDIR)\etc\linux\memoryerror.d : src\etc\linux\memoryerror.d
 
 ################### C\ASM Targets ############################
 
-errno_c.obj : src\core\stdc\errno.c
-	$(CC) -c $(CFLAGS) src\core\stdc\errno.c -oerrno_c.obj
+errno_c$(MODEL).obj : src\core\stdc\errno.c
+	$(CC) -c $(CFLAGS) src\core\stdc\errno.c -o$@
 
 src\rt\minit.obj : src\rt\minit.asm
 	$(CC) -c $(CFLAGS) src\rt\minit.asm

diff --git a/win64.mak b/win64.mak
@@ -43,8 +43,8 @@ $(mak\SRCS)
 # NOTE: a pre-compiled minit.obj has been provided in dmd for Win32 and
 #       minit.asm is not used by dmd for Linux
 
-OBJS= errno_c.obj
-OBJS_TO_DELETE= errno_c.obj
+OBJS= errno_c$(MODEL).obj
+OBJS_TO_DELETE= errno_c$(MODEL).obj
 
 ######################## Doc .html file generation ##############################
 
@@ -640,8 +640,8 @@ $(IMPDIR)\etc\linux\memoryerror.d : src\etc\linux\memoryerror.d
 
 ################### C\ASM Targets ############################
 
-errno_c.obj : src\core\stdc\errno.c
-	$(CC) -c $(CFLAGS) src\core\stdc\errno.c -Foerrno_c.obj
+errno_c$(MODEL).obj : src\core\stdc\errno.c
+	$(CC) -c $(CFLAGS) src\core\stdc\errno.c -Fo$@
 
 src\rt\minit.obj : src\rt\minit.asm
 	$(CC) -c $(CFLAGS) src\rt\minit.asm