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

ruby-changes:50166

From: nobu <ko1@a...>
Date: Wed, 7 Feb 2018 22:45:18 +0900 (JST)
Subject: [ruby-changes:50166] nobu:r62284 (trunk): defs/gmake.mk: make universal mjit_min_header link

nobu	2018-02-07 22:45:14 +0900 (Wed, 07 Feb 2018)

  New Revision: 62284

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

  Log:
    defs/gmake.mk: make universal mjit_min_header link

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 62283)
+++ defs/gmake.mk	(revision 62284)
@@ -162,5 +162,7 @@ $(MJIT_MIN_HEADER): $(mjit_min_headers) https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L162
 	done
 	$(RM) $@.tmp
 	$(IFCHANGE) $@ $@.new
+	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
 
 endif
Index: common.mk
===================================================================
--- common.mk	(revision 62283)
+++ common.mk	(revision 62284)
@@ -192,6 +192,15 @@ COMPILE_PRELUDE = $(srcdir)/tool/generic https://github.com/ruby/ruby/blob/trunk/common.mk#L192
 
 SHOWFLAGS = showflags
 
+MAKE_LINK = $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
+	  -e "src, dest = ARGV" \
+	  -e "exit if File.identical?(src, dest) or cmp(src, dest) rescue nil" \
+	  -e "def noraise; yield; rescue; rescue NotImplementedError; end" \
+	  -e "noraise {ln_sf('../'*dest.count('/')+src, dest)} or" \
+	  -e "noraise {ln(src, dest)} or" \
+	  -e "cp(src, dest)"
+
+
 all: $(SHOWFLAGS) main docs
 
 main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs $(MJIT_MIN_HEADER)
@@ -210,14 +219,7 @@ $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFF https://github.com/ruby/ruby/blob/trunk/common.mk#L219
 	$(ECHO) building $@
 	$(MINIRUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC) $(ARCH_FLAG)" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@
 	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
-	$(Q) $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
-	  -e "src, dest = ARGV" \
-	  -e "exit if File.identical?(src, dest) or cmp(src, dest) rescue nil" \
-	  -e "def noraise; yield; rescue; rescue NotImplementedError; end" \
-	  -e "noraise {ln_sf('../'*dest.count('/')+src, dest)} or" \
-	  -e "noraise {ln(src, dest)} or" \
-	  -e "cp(src, dest)" \
-	  $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
+	$(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)
 
 .PHONY: showflags
 exts enc trans: $(SHOWFLAGS)

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

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