aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-10 04:24:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-10 04:24:08 +0000
commit5abfe357d2a8d3111841d2917d8ce286b47a0db9 (patch)
tree53f1b9733dae52acc2bd7aaa707d4c9f5b64866c
parent22485ac0d6baeb04d03a67639a6eb40fcb0b43fd (diff)
downloadruby-5abfe357d2a8d3111841d2917d8ce286b47a0db9.tar.gz
fiddle: fix $(SUBMAKE_PRE)
* ext/fiddle/extconf.rb: fix $(SUBMAKE_PRE) to chdir to $(LIBFFI_DIR) instead of $(@D), since $(LIBFFI_A) is not underneath libffi but under .libs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/fiddle/extconf.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 43d3053a48..9e244ed27d 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -149,9 +149,9 @@ create_makefile 'fiddle' do |conf|
if !libffi
next conf << "LIBFFI_CLEAN = none\n"
elsif $gnumake && !$nmake
- submake_arg = "-C $(@D)\n"
+ submake_arg = "-C $(LIBFFI_DIR)\n"
else
- submake_pre = "cd $(@D) && #{config_string("exec")}".strip
+ submake_pre = "cd $(LIBFFI_DIR) && #{config_string("exec")}".strip
end
if $nmake
cmd = "$(RUBY) -C $(LIBFFI_DIR) #{libffi_config} --srcdir=$(LIBFFI_SRCDIR)"