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

From 11793f897ce40e833d69d5cd76c13e08a611bcd9 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 28 May 2022 15:52:57 +0900
Subject: Reduce duplicate replacements

Reduce duplicate replacements so that reflect macros in command lines
consitently.  So that reflect macros in command lines.  Others than
`nmake` have no problems with nested expansions.
---
 template/Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/template/Makefile.in b/template/Makefile.in
index 12d23e1fa9..e55f466efc 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -128,7 +128,7 @@ XDLDFLAGS = @DLDFLAGS@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L128
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
 SOLIBS = @SOLIBS@
 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@
-MAINLIBS = @YJIT_LIBS@ @MAINLIBS@
+MAINLIBS = $(YJIT_LIBS) @MAINLIBS@
 ARCHMINIOBJS = @MINIOBJS@
 DLNOBJ = @DLNOBJ@
 ENCOBJS = @ENCOBJS@
@@ -166,7 +166,7 @@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L166
 BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
 COROUTINE_H = @X_COROUTINE_H@
-COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@)
+COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT))
 COROUTINE_SRC = @X_COROUTINE_SRC@
 
 #### End of system configuration section. ####
@@ -253,7 +253,7 @@ MINIPRELUDE_C = miniprelude.c https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L253
 GOLF_PRELUDE_C= golf_prelude.c
 RBCONFIG      = .rbconfig.time
 
-MAINSRC = $(MAINOBJ:.@OBJEXT@=.c)
+MAINSRC = $(MAINOBJ:.$(OBJEXT)=.c)
 
 SRC_FILE      = $<
 OS_SRC_FILE   = $<
@@ -446,11 +446,11 @@ $(srcdir)/enc/jis/props.h: enc/jis/props.kwd https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L446
 	  $(CP) $@ $(?:.kwd=.h.blt); \
 	fi
 
-.c.@OBJEXT@:
+.c.$(OBJEXT):
 	@$(ECHO) compiling $<
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
 
-.$(ASMEXT).@OBJEXT@:
+.$(ASMEXT).$(OBJEXT):
 	@$(ECHO) assembling $<
 	$(Q) $(CC) $(ASFLAGS) -DSYMBOL_PREFIX=$(SYMBOL_PREFIX) -o $@ -c $<
 
-- 
cgit v1.2.1


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