summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-11 03:54:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-11 03:54:45 +0000
commit24b6863f79cff8ee70c7cda101fe108b0ab331dc (patch)
tree0fb4a72f5d18d4245c93959b0e6f5a78be33a67f /ext
parent463856a7c4133cc3da8d611bee9c3af67ed95159 (diff)
fiddle: check assembler
* ext/fiddle/extconf.rb: requires assembler for src/win{32,64}.S. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/fiddle/extconf.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index a05eccf008..1adbc11eca 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -46,6 +46,9 @@ begin
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)