diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2020-08-09 01:00:44 +0300 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2020-08-09 01:00:44 +0300 |
| commit | 91280b4c0b3ec0721a8f3ba09a1cc9f5ca56c238 (patch) | |
| tree | dc63a10a1dfb87963909d3d52a8d689d775088dd /auto | |
| parent | 317fabc83e7ef7c423a64388de67ea851115b1b9 (diff) | |
| download | unit-91280b4c0b3ec0721a8f3ba09a1cc9f5ca56c238.tar.gz unit-91280b4c0b3ec0721a8f3ba09a1cc9f5ca56c238.tar.bz2 | |
Ruby: fixed gem mount paths.
The gem paths must depend on the specified interpreter.
Also, gemdir looks redundant as it's already included in Gem.default_path().
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/modules/ruby | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/auto/modules/ruby b/auto/modules/ruby index bf628935..c1444f07 100644 --- a/auto/modules/ruby +++ b/auto/modules/ruby @@ -62,8 +62,8 @@ if /bin/sh -c "$NXT_RUBY -v" >> $NXT_AUTOCONF_ERR 2>&1; then NXT_RUBY_LIBDIR=`$NXT_RUBY -rrbconfig -e 'print RbConfig::CONFIG["rubylibdir"]'` NXT_RUBY_TOPDIR=`$NXT_RUBY -rrbconfig -e 'print RbConfig::CONFIG["topdir"]'` NXT_RUBY_PREFIXDIR=`$NXT_RUBY -rrbconfig -e 'print RbConfig::CONFIG["rubylibprefix"]'` - NXT_RUBY_GEMDIR=`gem environment gemdir` - NXT_RUBY_GEMPATH=`gem environment gempath` + + NXT_RUBY_GEMPATH=`$NXT_RUBY -rrubygems -e 'print Gem.default_path().join(":")'` NXT_RUBY_INCPATH="-I$NXT_RUBY_ARCHHDRDIR -I$NXT_RUBY_RUBYHDRDIR" @@ -163,8 +163,6 @@ static const nxt_fs_mount_t nxt_ruby_mounts[] = { (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, {(u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, - {(u_char *) "$NXT_RUBY_GEMDIR", (u_char *) "$NXT_RUBY_GEMDIR", - (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, {(u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, {(u_char *) "$NXT_RUBY_PREFIXDIR", (u_char *) "$NXT_RUBY_PREFIXDIR", |