From f75d4ca72cb3a9f273d0dc16b0b5a4ea49eb3daa Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Jan 2009 17:13:19 +0000
Subject: merges r21873 from trunk into ruby_1_9_1. * configure.in (OBJCOPY):
 not used on Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    | 4 ++++
 configure.in | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1eada9b194..5bcc2f5382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 29 14:08:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (OBJCOPY): not used on Windows.
+
 Thu Jan 29 12:29:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rake.rb (FileUtils#rake_system): no longer needs workaround
diff --git a/configure.in b/configure.in
index 8dc2938b97..f409ab823c 100644
--- a/configure.in
+++ b/configure.in
@@ -217,6 +217,11 @@ AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
 AC_SUBST(ASFLAGS)
 
+case "$target_os" in
+cygwin*|mingw*)
+    ac_cv_prog_OBJCOPY=":";;
+esac
+
 # BSD's ports and MacPorts prefix GNU binutils with 'g'
 AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
 AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
-- 
cgit v1.2.3