Merge pull request #1362 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
dlang · Aug 28, 2015 · 5fd779b · 5fd779b
2 parents e054ff2 + 62e5ef9
commit 5fd779b
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 ##############################
 
@@ -642,8 +642,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 -o$@ $(CFLAGS) src\core\stdc\errno.c
 
 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 stdio_msvc_$(MODEL).obj
-OBJS_TO_DELETE= errno_c.obj stdio_msvc_$(MODEL).obj
+OBJS= errno_c_$(MODEL).obj stdio_msvc_$(MODEL).obj
+OBJS_TO_DELETE= errno_c_$(MODEL).obj stdio_msvc_$(MODEL).obj
 
 ######################## Doc .html file generation ##############################
 
@@ -652,8 +652,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 -Fo$@ $(CFLAGS) src\core\stdc\errno.c
 
 stdio_msvc_$(MODEL).obj : src\rt\stdio_msvc.c win64.mak
 	$(CC) -c -Fo$@ $(CFLAGS) src\rt\stdio_msvc.c