diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2025-08-28 19:01:48 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2025-08-28 19:01:48 +0900 |
| commit | 6023195fbd7f422e94b9d5cdee39273f71f9078f (patch) | |
| tree | c6b9f698a08178c7c83566d9518c52e75753434e | |
| parent | e7fb87ee3a826a387e5bfb9edea059f1aa065462 (diff) | |
Abandon `ruby` target on the others than GNU make
The default non-transformed name, `ruby` target was added for the case
of `--program-transform-name` and similars, but it was occasionally
added even when no such option is used.
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | defs/gmake.mk | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 1 |
3 files changed, 6 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 82f144a8bb..3637485675 100644 --- a/configure.ac +++ b/configure.ac @@ -4699,21 +4699,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [ echo; echo '$(srcdir)/$(CONFIGURE):RUBY_M4_INCLUDED \ $(empty)' - } > $tmpmk && AS_IF([! grep '^ruby:' $tmpmk > /dev/null], [ - AS_IF([test "${gnumake}" = yes], [ - tmpgmk=confgmk$$.tmp - { - echo "include $tmpmk" - echo "-include uncommon.mk" - } > $tmpgmk - ], [ - tmpgmk=$tmpmk - ]) && - test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" && - echo 'ruby: $(PROGRAM);' >> $tmpmk - rm -f uncommon.mk # remove stale uncommon.mk, it should be updated by GNUmakefile - test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk" - ]) && mv -f $tmpmk Makefile], + } > $tmpmk && mv -f $tmpmk Makefile], [EXEEXT='$EXEEXT' MAKE='${MAKE-make}' gnumake='$gnumake' GIT='$GIT' YJIT_SUPPORT='$YJIT_SUPPORT']) AC_ARG_WITH([ruby-pc], diff --git a/defs/gmake.mk b/defs/gmake.mk index bd4b8b8e39..795320ce2d 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -161,6 +161,10 @@ endif config.status: $(wildcard config.cache) +ifneq (ruby,$(PROGRAM)) +ruby: $(PROGRAM); +endif + STUBPROGRAM = rubystub$(EXEEXT) IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# SCRIPTBINDIR := $(if $(EXEEXT),,exec/) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 3312faa7d6..ade48d5e75 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -540,6 +540,7 @@ ECHO_END = all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk $(srcdir)/depend prog: config +# The default non-transformed names without $(EXEEXT). ruby: $(PROGRAM) rubyw: $(WPROGRAM) stub: $(STUBPROGRAM) |