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

ruby-changes:45520

From: nobu <ko1@a...>
Date: Fri, 10 Feb 2017 13:24:13 +0900 (JST)
Subject: [ruby-changes:45520] nobu:r57593 (trunk): fiddle: fix $(SUBMAKE_PRE)

nobu	2017-02-10 13:24:08 +0900 (Fri, 10 Feb 2017)

  New Revision: 57593

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

  Log:
    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.

  Modified files:
    trunk/ext/fiddle/extconf.rb
Index: ext/fiddle/extconf.rb
===================================================================
--- ext/fiddle/extconf.rb	(revision 57592)
+++ ext/fiddle/extconf.rb	(revision 57593)
@@ -149,9 +149,9 @@ create_makefile 'fiddle' do |conf| https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L149
   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)"

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

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