aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-20 09:02:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-02-20 09:02:28 +0000
commit52911974f8f1a9d975d63ad606f5a7ebc5b19c01 (patch)
treee38e8e3665b5eda420b44cb63bb1d11bc7cbf24b
parent67ab6e3d9bea6f8279bf50fab3a3174f23eeaca6 (diff)
downloadruby-52911974f8f1a9d975d63ad606f5a7ebc5b19c01.tar.gz
configure.in: target_os suffix
* configure.in (target_os): do not strip -gnu suffix on Linux if --target is given explicitly. [Bug #7874] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fba8ce99dd..d19ef12ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Wed Feb 20 18:01:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Feb 20 18:02:26 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (target_os): do not strip -gnu suffix on Linux if
+ --target is given explicitly. [Bug #7874]
* configure.in (libdirname): adjust library path name which libruby
files will be installed. [Bug #7874]
diff --git a/configure.in b/configure.in
index e8f56e3380..07dbc5ddb0 100644
--- a/configure.in
+++ b/configure.in
@@ -211,6 +211,7 @@ AC_DEFINE_UNQUOTED(RUBY_BASE_NAME, "${RUBY_BASE_NAME}" !<verconf>!)
AC_DEFINE_UNQUOTED(RUBY_VERSION_NAME, RUBY_BASE_NAME"-"RUBY_LIB_VERSION !<verconf>!)
AC_CANONICAL_TARGET
+test x"$target_alias" = x &&
target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
ac_install_sh='' # unusable for extension libraries.