diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.in | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Tue Oct 7 10:37:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_UNIVERSAL_ARCH): fix missing quoting + brackets. incorporated from + http://www.opensource.apple.com/source/ruby/ruby-104/patches/configure.diff + Mon Oct 6 23:34:42 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole_param.c: use typed data. diff --git a/configure.in b/configure.in index 0357a14b68..37e176e5fb 100644 --- a/configure.in +++ b/configure.in @@ -314,8 +314,8 @@ AC_MSG_RESULT([$ARCH_FLAG]) AC_DEFUN([RUBY_UNIVERSAL_ARCH], [ # RUBY_UNIVERSAL_ARCH begin ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']` -test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'` -test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'` +test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed [-e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']` +test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed [-e 's/ *-arch *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']` unset universal_binary universal_archnames if test ${target_archs+set}; then AC_MSG_CHECKING([target architectures]) |