From 22c750bb8d824bc706193240bfb3bfa52ad9850b Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 24 Jan 2015 15:42:27 +0000 Subject: [PATCH] libffi: workaround of VC12 ml * ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix. workaround of a bug of VC12 ml, by unak at [ruby-core:67792]. [ruby-core:67789] [Bug #10780] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/fiddle/win32/libffi.mk.tmpl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 295f553f48..7af21fec75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 25 00:42:24 2015 Nobuyoshi Nakada + + * ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix. + workaround of a bug of VC12 ml, by unak at [ruby-core:67792]. + [ruby-core:67789] [Bug #10780] + Sat Jan 24 19:56:25 2015 Nobuyoshi Nakada * dln_find.c (dln_find_1): search regular files only. based on diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl index 412a75aec8..2a16e8efec 100755 --- a/ext/fiddle/win32/libffi.mk.tmpl +++ b/ext/fiddle/win32/libffi.mk.tmpl @@ -72,7 +72,7 @@ all: $(WORKDIR) $(STATICLIB) $(CPP) $(CFLAGS) $(INCLUDES) $(<:\=/) >$(@:\=/) {$(BUILDDIR)/x86}.asm{$(BUILDDIR)/x86}.$(OBJEXT): - $(AS) -c $(ASFLAGS) -Fo $(@:\=/) $(<:\=/) + cd $(@D) && $(AS) -c $(ASFLAGS) -Fo $(@F) $(