From 50a585ed2573d718be7d25c1db3a470e58ca5bf0 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 27 Jul 2015 03:45:11 +0000
Subject: fiddle: unexpand LIBFFI_DIR

* ext/fiddle/extconf.rb: use LIBFFI_DIR instead of expanding it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/fiddle/extconf.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'ext/fiddle')

diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index f13e4144b6..c006439e6a 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -140,7 +140,8 @@ types.each do |type, signed|
 end
 
 if libffi
-  $LOCAL_LIBS.prepend("./#{libffi.a} ").strip!
+  $LOCAL_LIBS.prepend("./$(LIBFFI_A) ").strip!
+  $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
 end
 create_makefile 'fiddle' do |conf|
   if !libffi
@@ -161,9 +162,9 @@ create_makefile 'fiddle' do |conf|
    PWD =
    LIBFFI_CONFIGURE = #{cmd}
    LIBFFI_ARCH = #{libffi.arch}
-   LIBFFI_SRCDIR = #{libffi.srcdir}
+   LIBFFI_SRCDIR = #{libffi.srcdir.sub(libffi.dir, '$(LIBFFI_DIR)')}
    LIBFFI_DIR = #{libffi.dir}
-   LIBFFI_A = #{libffi.a}
+   LIBFFI_A = #{libffi.a.sub(libffi.dir, '$(LIBFFI_DIR)')}
    LIBFFI_CFLAGS = #{libffi.cflags}
    LIBFFI_LDFLAGS = #{libffi.ldflags}
    FFI_H = $(LIBFFI_DIR)/include/ffi.h
-- 
cgit v1.2.3