Mercurial > vim
changeset 31188:aaaf695aeb6c v9.0.0928
patch 9.0.0928: using Ruby LDFLAGS may cause build problems
Commit: https://github.com/vim/vim/commit/1d822afaf66a84fab71c84521fd92db11d2c8925
Author: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed Nov 23 12:06:08 2022 +0000
patch 9.0.0928: using Ruby LDFLAGS may cause build problems
Problem: Using Ruby LDFLAGS may cause build problems.
Solution: Do not add Ruby LDFLAGS to Vim's LDFLAGS. (Zdenek Dohnal,
closes #11592)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 23 Nov 2022 13:15:03 +0100 |
| parents | d18b1f43cfd7 |
| children | 7b842cdc072d |
| files | src/auto/configure src/configure.ac src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -7683,15 +7683,8 @@ fi if test "X$librubyarg" != "X"; then RUBY_LIBS="$librubyarg $RUBY_LIBS" fi - rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG['LDFLAGS']"` - if test "X$rubyldflags" != "X"; then - rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` - if test "X$rubyldflags" != "X"; then - if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$rubyldflags\"`" = "X"; then - LDFLAGS="$rubyldflags $LDFLAGS" - fi - fi - fi + + RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro"
--- a/src/configure.ac +++ b/src/configure.ac @@ -2034,18 +2034,10 @@ if test "$enable_rubyinterp" = "yes" -o if test "X$librubyarg" != "X"; then RUBY_LIBS="$librubyarg $RUBY_LIBS" fi - rubyldflags=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig::CONFIG[['LDFLAGS']]"` - if test "X$rubyldflags" != "X"; then - dnl Ruby on Mac OS X 10.5 adds "-arch" flags but these should only - dnl be included if requested by passing --with-mac-arch to - dnl configure, so strip these flags first (if present) - rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` - if test "X$rubyldflags" != "X"; then - if test "X`echo \"$LDFLAGS\" | $FGREP -e \"$rubyldflags\"`" = "X"; then - LDFLAGS="$rubyldflags $LDFLAGS" - fi - fi - fi + + dnl Here the Ruby LDFLAGS used to be added to LDFLAGS, but that turns + dnl out to cause trouble and was removed. + RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro"