diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | ext/fiddle/win32/libffi.mk.tmpl | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Feb 6 12:02:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Fri Feb 6 01:03:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * marshal.c (w_object, marshal_dump): use indetity tables for diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl index 621451e7a2..28d0a67897 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) $(<F) $(BUILDDIR)/x86/$(OSSRC).asm: $(SRCDIR)/x86/$(OSSRC).S @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-06" -#define RUBY_PATCHLEVEL 39 +#define RUBY_PATCHLEVEL 40 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |