Skip to content

Commit 6023195

Browse files
committed
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.
1 parent e7fb87e commit 6023195

3 files changed

Lines changed: 6 additions & 15 deletions

File tree

configure.ac

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4699,21 +4699,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
46994699
47004700
echo; echo '$(srcdir)/$(CONFIGURE):RUBY_M4_INCLUDED \
47014701
$(empty)'
4702-
} > $tmpmk && AS_IF([! grep '^ruby:' $tmpmk > /dev/null], [
4703-
AS_IF([test "${gnumake}" = yes], [
4704-
tmpgmk=confgmk$$.tmp
4705-
{
4706-
echo "include $tmpmk"
4707-
echo "-include uncommon.mk"
4708-
} > $tmpgmk
4709-
], [
4710-
tmpgmk=$tmpmk
4711-
]) &&
4712-
test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
4713-
echo 'ruby: $(PROGRAM);' >> $tmpmk
4714-
rm -f uncommon.mk # remove stale uncommon.mk, it should be updated by GNUmakefile
4715-
test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
4716-
]) && mv -f $tmpmk Makefile],
4702+
} > $tmpmk && mv -f $tmpmk Makefile],
47174703
[EXEEXT='$EXEEXT' MAKE='${MAKE-make}' gnumake='$gnumake' GIT='$GIT' YJIT_SUPPORT='$YJIT_SUPPORT'])
47184704

47194705
AC_ARG_WITH([ruby-pc],

defs/gmake.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,10 @@ endif
161161

162162
config.status: $(wildcard config.cache)
163163

164+
ifneq (ruby,$(PROGRAM))
165+
ruby: $(PROGRAM);
166+
endif
167+
164168
STUBPROGRAM = rubystub$(EXEEXT)
165169
IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
166170
SCRIPTBINDIR := $(if $(EXEEXT),,exec/)

win32/Makefile.sub

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ ECHO_END =
540540
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk $(srcdir)/depend
541541
prog: config
542542

543+
# The default non-transformed names without $(EXEEXT).
543544
ruby: $(PROGRAM)
544545
rubyw: $(WPROGRAM)
545546
stub: $(STUBPROGRAM)

0 commit comments

Comments
 (0)