diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-14 08:11:59 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-14 08:11:59 +0000 |
commit | 90e1093a1479a59325e89e32cc8610be1cd640a0 (patch) | |
tree | 3120b73c007e312332cb885492f0964fd8715c2c /configure.in | |
parent | 12ebc7f5be448d39f72369449e3a0b9bc32e16b0 (diff) |
merges r28628 from trunk into ruby_1_9_2.
--
* configure.in: fix for universal binary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index b3c5642fcf..e97216f557 100644 --- a/configure.in +++ b/configure.in @@ -287,7 +287,7 @@ AC_SUBST(COUTFLAG) RUBY_MINGW32 RUBY_UNIVERSAL_ARCH -if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no; then +if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then RUBY_DEFAULT_ARCH("$target_cpu") fi |