diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-23 05:25:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-23 05:25:56 +0000 |
| commit | 32df7768b8475c0339be6b2ef6a077edd488d4e1 (patch) | |
| tree | be24ceb8ae87a0763d3f9140744ef70d59fdce66 | |
| parent | a56b1bc27b70d2ce609a456043b05161a20a1082 (diff) | |
* configure.in (target, target_alias): replace with real cpu.
* mkconfig.rb: build* are not needed in rbconfig.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 1 |
3 files changed, 16 insertions, 5 deletions
@@ -1,4 +1,8 @@ -Fri Oct 23 14:22:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Oct 23 14:25:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (target, target_alias): replace with real cpu. + + * mkconfig.rb: build* are not needed in rbconfig.rb. * configure.in (warnflags): use -Wextra only when -Wno-missing-field-initializers is available. diff --git a/configure.in b/configure.in index db5ff50db5..b764b56cf6 100644 --- a/configure.in +++ b/configure.in @@ -189,18 +189,18 @@ if test ${target_archs+set}; then esac AC_MSG_RESULT([$target_archs]) + target=`echo $target | sed "s/^$target_cpu-/-/"` + target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"` if test "${universal_binary-no}" = yes; then RUBY_PREREQ_AC(2.63, [ to compile universal binary]) AC_SUBST(try_header,try_compile) - target=`echo $target | sed "s/^$target_cpu-/universal-/"` - target_alias=`echo $target_alias | sed "s/^$target_cpu-/universal-/"` target_cpu=universal real_cross_compiling=$cross_compiling else - target=`echo $target | sed "s/^$target_cpu-/${target_archs}-/"` - target_alias=`echo $target_alias | sed "s/^$target_cpu-/${target_archs}-/"` target_cpu=${target_archs} fi + case "$target" in when(-*) target="$target_cpu${target}";; esac + case "$target_alias" in when(-*) target_alias="$target_cpu${target_alias}";; esac CFLAGS="$CFLAGS ${ARCH_FLAG}" LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}" else @@ -208,6 +208,7 @@ else case "$target_os" in when(darwin*) AC_MSG_CHECKING([for real target cpu]) + target=`echo $target | sed "s/^$target_cpu-/-/"` target_cpu=`$CC -E - 2>/dev/null <<EOF | #ifdef __x86_64__ "processor-name=x86_64" @@ -223,6 +224,7 @@ else #endif EOF sed -n 's/^"processor-name=\(.*\)"/\1/p'` + target="$target_cpu${target}" AC_MSG_RESULT([$target_cpu]) ;; esac @@ -311,7 +313,11 @@ when(cygwin*|mingw*) AC_CHECK_TOOL(NM, nm) AC_CHECK_TOOL(WINDRES, windres) AC_CHECK_TOOL(DLLWRAP, dllwrap) + target=`echo $target | sed "s/^$target_cpu-/-/"` + target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"` target_cpu=`echo $target_cpu | sed s/i.86/i386/` + case "$target" in when(-*) target="$target_cpu${target}";; esac + case "$target_alias" in when(-*) target_alias="$target_cpu${target_alias}";; esac case "$target_os" in when(mingw*) test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index ca1f46713a..846b6ab880 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -77,6 +77,7 @@ File.foreach "config.status" do |line| when /^RUBY_SO_NAME$/; next if $so_name when /^arch$/; if val.empty? then val = arch else arch = val end when /^sitearch/; val = '$(arch)' if val.empty? + when /^build/; next end case val when /^\$\(ac_\w+\)$/; next |