diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-09-29 13:41:59 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-09-29 13:41:59 +0900 |
| commit | a9ff39087092b21059fca046ace9ca87770692a4 (patch) | |
| tree | b7801a8453f22e8f2c6eea615251deee2e6c2809 | |
| parent | b971f141b20d484c48358e5f2d4d9b6957ccd17a (diff) | |
| download | ruby-a9ff39087092b21059fca046ace9ca87770692a4.tar.gz | |
Fixed installation failure [Bug #17191]
Try update and extract bundled gems only when baseruby is
available. It should be done only when installing from
developemental build and not from the tarball, but it is not
obvious to differentiate them.
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | defs/gmake.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1296,7 +1296,7 @@ update-config_files: PHONY config.guess config.sub refresh-gems: update-bundled_gems prepare-gems -prepare-gems: update-gems extract-gems +prepare-gems: $(HAVE_BASERUBY:yes=update-gems) $(HAVE_BASERUBY:yes=extract-gems) update-gems$(gnumake:yes=-nongnumake): PHONY $(ECHO) Downloading bundled gem files... diff --git a/defs/gmake.mk b/defs/gmake.mk index 7e9566fee6..31af44a4f1 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -246,7 +246,7 @@ HELP_EXTRA_TASKS = \ " update-github: merge master branch and push it to Pull Request [PR=1234]" \ "" -extract-gems: update-gems +extract-gems: $(HAVE_BASERUBY:yes=update-gems) BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems) |