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

ruby-changes:57837

From: Nobuyoshi <ko1@a...>
Date: Fri, 20 Sep 2019 17:07:55 +0900 (JST)
Subject: [ruby-changes:57837] 04c53a1d03 (master): Get rid of embedding make command line

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

From 04c53a1d03130b5cd4a1eea35cab92003a4d0909 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Fri, 20 Sep 2019 17:05:52 +0900
Subject: Get rid of embedding make command line

NMAKE sets MAKE to the full path name, which includes spaces by
the default installation.

diff --git a/ext/-test-/cxxanyargs/depend b/ext/-test-/cxxanyargs/depend
index a2c74a8..ad8260a 100644
--- a/ext/-test-/cxxanyargs/depend
+++ b/ext/-test-/cxxanyargs/depend
@@ -2,9 +2,10 @@ $(TARGET_SO) $(STATIC_LIB): failure.failed https://github.com/ruby/ruby/blob/trunk/ext/-test-/cxxanyargs/depend#L2
 
 failure.failed: failure.cpp cxxanyargs.o
 	$(Q)$(RUBY) -rfileutils \
-	  -e "err = IO.popen(%[$(MAKE) failure.o], err:[:child, :out], &:read)" \
+	  -e "t = ARGV.shift" \
+	  -e "err = IO.popen(ARGV, err:[:child, :out], &:read)" \
 	  -e "abort err unless /rb_define_method/ =~ err" \
-	  -e "FileUtils.touch(*ARGV)" $@
+	  -e "FileUtils.touch(t)" $@ $(MAKE) failure.o
 
 # AUTOGENERATED DEPENDENCIES START
 cxxanyargs.o: $(RUBY_EXTCONF_H)
-- 
cgit v0.10.2


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

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