From fc05fb5e3ec7aa236c60596c049962a65ac8af16 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Fri, 25 Sep 2009 19:08:58 +0200 Subject: [PATCH] Strip x86_64 arch from Ruby LDFLAGS --- src/configure | 2 +- src/configure.in | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/configure b/src/configure index 461f9b5c81..55d73fd172 100755 --- a/src/configure +++ b/src/configure @@ -5743,7 +5743,7 @@ echo "${ECHO_T}$rubyhdrdir" >&6; } fi rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'` if test "X$rubyldflags" != "X"; then - rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//'` + rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` if test "X$rubyldflags" != "X"; then LDFLAGS="$rubyldflags $LDFLAGS" fi diff --git a/src/configure.in b/src/configure.in index a7d40580b5..445b76cdd5 100644 --- a/src/configure.in +++ b/src/configure.in @@ -993,10 +993,10 @@ 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 - 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//'` + dnl Ruby on Mac OS X 10.5 and later adds "-arch" flags but these + dnl should only be included if requested by passing --with-mac-arch + dnl to 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 LDFLAGS="$rubyldflags $LDFLAGS" fi