diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-24 22:45:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-24 22:45:13 +0000 |
| commit | cc11923a9d324dfcc0a3cf29fe981114b0314493 (patch) | |
| tree | b84691e3e550d9b6668fda176583a1b1dd1ae290 | |
| parent | 9eb6a24f3f223831b77806e414cbebce0d8d03bb (diff) | |
* configure.in (target_alias): replaces cpu with universal too.
* configure.in (target): replaces cpu with arch by --with-arch.
* mkconfig.rb (TOPDIR): chops arch in config instead of
RUBY_PLATFORM which varies on universal_binary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rwxr-xr-x | mkconfig.rb | 4 |
3 files changed, 16 insertions, 2 deletions
@@ -1,4 +1,11 @@ -Wed Mar 25 07:44:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Mar 25 07:45:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (target_alias): replaces cpu with universal too. + + * configure.in (target): replaces cpu with arch by --with-arch. + + * mkconfig.rb (TOPDIR): chops arch in config instead of + RUBY_PLATFORM which varies on universal_binary. * mkconfig.rb (MAJOR, MINOR, TEENY): reads from version.h always. diff --git a/configure.in b/configure.in index f12bd30c0e..58926ca368 100644 --- a/configure.in +++ b/configure.in @@ -179,7 +179,12 @@ if test ${target_archs+set}; 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 + 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 CFLAGS="$CFLAGS ${ARCH_FLAG}" LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}" diff --git a/mkconfig.rb b/mkconfig.rb index 1a3b6cebcf..67cc3fd1ea 100755 --- a/mkconfig.rb +++ b/mkconfig.rb @@ -34,6 +34,7 @@ module RbConfig ] +arch = RUBY_PLATFORM v_fast = [] v_others = [] vars = {} @@ -75,6 +76,7 @@ File.foreach "config.status" do |line| next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name next if /^(?:X|(?:MINI|RUN)RUBY$)/ =~ name + arch = val if name == "arch" if /^program_transform_name$/ =~ name and /^s(\\?.)(.*)\1$/ =~ val next if $install_name sep = %r"#{Regexp.quote($1)}" @@ -104,7 +106,7 @@ end drive = File::PATH_SEPARATOR == ';' -prefix = "/lib/ruby/#{version}/#{RUBY_PLATFORM}" +prefix = "/lib/ruby/#{version}/#{arch}" print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " CONFIG = {}\n" |