ruby-changes:61181
From: Nobuyoshi <ko1@a...>
Date: Mon, 11 May 2020 00:19:46 +0900 (JST)
Subject: [ruby-changes:61181] 3fa4fd4780 (master): Pass MAKE value to configure for non-default name case
https://git.ruby-lang.org/ruby.git/commit/?id=3fa4fd4780 From 3fa4fd4780f9b3a1f2058f8fd2733334868bf24c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Mon, 11 May 2020 00:17:02 +0900 Subject: Pass MAKE value to configure for non-default name case GNU make does not export it by default. diff --git a/configure.ac b/configure.ac index f78eb38..8e224d4 100644 --- a/configure.ac +++ b/configure.ac @@ -4079,7 +4079,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L4079 echo 'ruby: $(PROGRAM);' >> $tmpmk test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk" ]) && mv -f $tmpmk Makefile], -[EXEEXT='$EXEEXT' gnumake='$gnumake' GIT='$GIT']) +[EXEEXT='$EXEEXT' MAKE='$MAKE' gnumake='$gnumake' GIT='$GIT']) AC_ARG_WITH([ruby-pc], AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]), diff --git a/defs/gmake.mk b/defs/gmake.mk index 67898ce..9707aa7 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L1 # -*- mode: makefile-gmake; indent-tabs-mode: t -*- +reconfig config.status: export MAKE:=$(MAKE) override gnumake_recursive := $(if $(findstring n,$(firstword $(MFLAGS))),,+) override mflags := $(filter-out -j%,$(MFLAGS)) MSPECOPT += $(if $(filter -j%,$(MFLAGS)),-j) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/