diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-07-22 09:17:23 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-07-22 09:17:23 +0000 |
| commit | 996b6d86cc6cb108f6a48c474dd7116dccb5f4f9 (patch) | |
| tree | 787c7f0b04fb9df647b15fe880c03f42bcfb4499 | |
| parent | b245016c15abdaf65c15696c8abff188650734cd (diff) | |
updated for version 7.2-236v7.2.236
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.in | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure index 42f4784ddc..1049c0ceb3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5780,7 +5780,10 @@ $as_echo "$rubyhdrdir" >&6; } 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" diff --git a/src/configure.in b/src/configure.in index eb7db76747..1ad32d7a3a 100644 --- a/src/configure.in +++ b/src/configure.in @@ -984,7 +984,13 @@ if test "$enable_rubyinterp" = "yes"; then 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" diff --git a/src/version.c b/src/version.c index 8e55942668..fc4da307b8 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 236, +/**/ 235, /**/ 234, |