diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-05-11 00:17:02 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-05-11 00:18:06 +0900 |
| commit | 3fa4fd4780f9b3a1f2058f8fd2733334868bf24c (patch) | |
| tree | d7b1a10b816311aada7987152eceaf9fcb5f5b3e | |
| parent | f1699314147bad2cf5550cc582693424fdbc2510 (diff) | |
Pass MAKE value to configure for non-default name case
GNU make does not export it by default.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | defs/gmake.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f78eb38c93..8e224d473e 100644 --- a/configure.ac +++ b/configure.ac @@ -4079,7 +4079,7 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [ 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 67898cef3d..9707aa7c98 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -1,5 +1,6 @@ # -*- 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) |