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

ruby-changes:57816

From: Nobuyoshi <ko1@a...>
Date: Thu, 19 Sep 2019 22:10:04 +0900 (JST)
Subject: [ruby-changes:57816] e0c56b45a4 (master): Moved unmatch arity check to depend file

https://git.ruby-lang.org/ruby.git/commit/?id=e0c56b45a4

From e0c56b45a41f052223e23d222ca49c7e0225923e Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 19 Sep 2019 22:09:43 +0900
Subject: Moved unmatch arity check to depend file

To substitute suffixes and VPATH for nmake.

diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend
index 61649e1..a68afb8 100644
--- a/ext/-test-/cxxanyargs/depend
+++ b/ext/-test-/cxxanyargs/depend
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ext/-test-/cxxanyargs/depend#L1
+$(DLLIB) $(STATIC_LIB): failure.failed
+
+failure.failed: failure.cpp cxxanyargs.o
+	$(Q)$(RUBY) -rfileutils \\
+	  -e "err = IO.popen(%[$(MAKE) failure.o], err:[:child, :out], &:read)" \\
+	  -e "abort err unless /rb_define_method/ =~ err" \\
+	  -e "FileUtils.touch(*ARGV)" $@
+
 # AUTOGENERATED DEPENDENCIES START
 cxxanyargs.o: $(RUBY_EXTCONF_H)
 cxxanyargs.o: $(arch_hdrdir)/ruby/config.h
diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb
index 90ab856..b3f4547 100644
--- a/ext/-test-/cxxanyargs/extconf.rb
+++ b/ext/-test-/cxxanyargs/extconf.rb
@@ -24,16 +24,5 @@ end https://github.com/ruby/ruby/blob/trunk/ext/-test-/cxxanyargs/extconf.rb#L24
 if ok
   $srcs = %w[cxxanyargs.cpp]
   $cleanfiles << "failure.failed"
-  create_makefile("-test-/cxxanyargs") do |mk|
-    mk << <<MK
-
-cxxanyargs.#$OBJEXT: failure.failed
-
-failure.failed: failure.cpp
-\t$(Q)$(RUBY) -rfileutils \\
-\t  -e "err = IO.popen(%[$(MAKE) failure.#$OBJEXT], err:[:child, :out], &:read)" \\
-\t  -e "abort err unless /rb_define_method/ =~ err" \\
-\t  -e "FileUtils.touch(*ARGV)" $@
-MK
-  end
+  create_makefile("-test-/cxxanyargs")
 end
-- 
cgit v0.10.2


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

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