[前][次][番号順一覧][スレッド一覧]

ruby-changes:37127

From: nobu <ko1@a...>
Date: Sun, 11 Jan 2015 12:54:51 +0900 (JST)
Subject: [ruby-changes:37127] nobu:r49208 (trunk): fiddle: check assembler

nobu	2015-01-11 12:54:45 +0900 (Sun, 11 Jan 2015)

  New Revision: 49208

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

  Log:
    fiddle: check assembler
    
    * ext/fiddle/extconf.rb: requires assembler for src/win{32,64}.S.

  Modified files:
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 49207)
+++ ext/fiddle/extconf.rb	(revision 49208)
@@ -46,6 +46,9 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L46
   libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}")
   libffi.arch = RbConfig::CONFIG['host']
   if $mswin
+    unless find_executable(as = /x64/ =~ libffi.arch ? "ml64" : "ml")
+      raise "missing #{as} command."
+    end
     $defs << "-DFFI_BUILDING"
     libffi_config = "#{relative_from($srcdir, '..')}/win32/libffi-config.rb"
     config = CONFIG.merge("top_srcdir" => $top_srcdir)

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

[前][次][番号順一覧][スレッド一覧]