ruby-changes:69363
From: Nobuyoshi <ko1@a...>
Date: Sat, 23 Oct 2021 22:21:00 +0900 (JST)
Subject: [ruby-changes:69363] 185c573821 (master): Add INSTRUBY_OPTS to INSTRUBY_ARGS [ci skip]
https://git.ruby-lang.org/ruby.git/commit/?id=185c573821 From 185c5738211e16f289aa7448823f678348597bb5 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 23 Oct 2021 22:18:52 +0900 Subject: Add INSTRUBY_OPTS to INSTRUBY_ARGS [ci skip] For extra options from the `make` command line. Also add explicit `--install` option to install-nodoc. --- common.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 05c807e3d2..debef394b8 100644 --- a/common.mk +++ b/common.mk @@ -186,7 +186,8 @@ INSTRUBY_ARGS = $(SCRIPT_ARGS) \ https://github.com/ruby/ruby/blob/trunk/common.mk#L186 --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ --installed-list $(INSTALLED_LIST) \ - --mantype="$(MANTYPE)" + --mantype="$(MANTYPE)" \ + $(INSTRUBY_OPTS) INSTALL_PROG_MODE = 0755 INSTALL_DATA_MODE = 0644 @@ -384,7 +385,7 @@ post-install-all:: post-install-local post-install-ext post-install-gem post-ins https://github.com/ruby/ruby/blob/trunk/common.mk#L385 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc pre-install-nodoc:: pre-install-local pre-install-ext pre-install-gem do-install-nodoc: main pre-install-nodoc - $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --exclude=doc + $(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --exclude=doc post-install-nodoc:: post-install-local post-install-ext post-install-gem install-local: pre-install-local do-install-local post-install-local -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/