From c5fe904f6ea24a1f38c6a3b33937067f9390ca70 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 28 Nov 2018 01:04:39 +0000 Subject: Fix for coroutine/win32/Context.obj * coroutine/win32/Context.asm: old ml version 9 needs CPU directive before `.model` directive. * win32/Makefile.sub: specify object directories to separate Win32 and Win64 targets. Win32 rule was overridden by Win64 rule and just ignored. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/Makefile.sub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'win32/Makefile.sub') diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7ac6c6e2fd..7692173140 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1225,10 +1225,10 @@ $(ruby_pc): $(RBCONFIG) -output=$@ -mode=$(INSTALL_DATA_MODE) -config=rbconfig.rb \ $(srcdir)/template/ruby.pc.in -{$(srcdir)/coroutine/Win32}.asm.obj: +{$(srcdir)/coroutine/Win32}.asm{coroutine/Win32}.obj: $(ECHO) assembling $(<:\=/) $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) -{$(srcdir)/coroutine/Win64}.asm.obj: +{$(srcdir)/coroutine/Win64}.asm{coroutine/Win64}.obj: $(ECHO) assembling $(<:\=/) $(Q) $(AS) $(ASFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:\=/) -- cgit v1.2.3