Mercurial > vim
changeset 1939:41d8447a8457 v7.2.236
updated for version 7.2-236
| author | vimboss |
|---|---|
| date | Wed, 22 Jul 2009 09:17:23 +0000 |
| parents | 5ed9395c1864 |
| children | e753954c86e2 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5780,7 +5780,10 @@ fi fi rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` if test "X$rubyldflags" != "X"; then - LDFLAGS="$rubyldflags $LDFLAGS" + rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` + if test "X$rubyldflags" != "X"; then + LDFLAGS="$rubyldflags $LDFLAGS" + fi fi RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o"
--- a/src/configure.in +++ b/src/configure.in @@ -984,7 +984,13 @@ if test "$enable_rubyinterp" = "yes"; th fi rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` if test "X$rubyldflags" != "X"; then - LDFLAGS="$rubyldflags $LDFLAGS" + 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//'` + if test "X$rubyldflags" != "X"; then + LDFLAGS="$rubyldflags $LDFLAGS" + fi fi RUBY_SRC="if_ruby.c" RUBY_OBJ="objects/if_ruby.o"