From 1b6774db57a38f3da4701fe0fb8d25272c1093c1 Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Wed, 26 Aug 2015 01:23:03 +0200 Subject: [PATCH] fix -m32mscoff issue with errno_c.obj - use C objs depending on MODEL so that we never end up with the wrong obj file in a lib --- win32.mak | 8 ++++---- win64.mak | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/win32.mak b/win32.mak index 1cf453ff622..00fb20849dc 100644 --- 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 index b8f2cb8201a..21bffd57568 100644 --- 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