naruse	2015-02-06 12:02:27 +0900 (Fri, 06 Feb 2015)

  New Revision: 49521

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49521

  Log:
    merge revision(s) 49397: [Backport #10780]
    
    * 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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/fiddle/win32/libffi.mk.tmpl
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49520)
+++ ruby_2_2/ChangeLog	(revision 49521)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Feb  6 12:02:05 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* marshal.c (w_object, marshal_dump): use indetity tables for
Index: ruby_2_2/ext/fiddle/win32/libffi.mk.tmpl
===================================================================
--- ruby_2_2/ext/fiddle/win32/libffi.mk.tmpl	(revision 49520)
+++ ruby_2_2/ext/fiddle/win32/libffi.mk.tmpl	(revision 49521)
@@ -72,7 +72,7 @@ all: $(WORKDIR) $(STATICLIB) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/fiddle/win32/libffi.mk.tmpl#L72
 	$(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
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49520)
+++ ruby_2_2/version.h	(revision 49521)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49397


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/