diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 03:02:27 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-06 03:02:27 +0000 |
| commit | 20a130427b8b3b96e4dd2409073f5154e9b836a4 (patch) | |
| tree | 86e3e0c7834240f852186bdd30834e2dbdd3bc20 /ext/fiddle | |
| parent | 665f7a2ff1ce1c73118eb06e13a35d480ab89c3c (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle')
| -rwxr-xr-x | ext/fiddle/win32/libffi.mk.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
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 |