aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-21 02:42:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-21 02:42:33 +0000
commit003710957b63dafda7535aa84df10b0a2b5ae00e (patch)
treef1d84a8605e05fd5a8177ca9485282adcbe02ac7
parent7bf10e8787912565c53bb774e7508c2955515326 (diff)
downloadruby-003710957b63dafda7535aa84df10b0a2b5ae00e.tar.gz
configure.in: Info.plist workaround
* configure.in: workaround for Info.plist to get rid of `dsymutil` crash by wrong files in parent directories. [ruby-core:62594] [Bug #9840] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in9
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d7dc69207b..45a651ca6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 21 11:42:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: workaround for Info.plist to get rid of `dsymutil`
+ crash by wrong files in parent directories.
+ [ruby-core:62594] [Bug #9840]
+
Tue May 20 20:57:34 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_dir.rb (test_glob): added testcase of double
diff --git a/configure.in b/configure.in
index 6b14d21db1..97e95eeb52 100644
--- a/configure.in
+++ b/configure.in
@@ -691,13 +691,22 @@ RUBY_WERROR_FLAG([
]
)
AC_MSG_CHECKING([whether LDFLAGS is valid])
+ {
+ mkdir tmp.$$.try_link &&
+ cd tmp.$$.try_link &&
+ cp ../confdefs.h . &&
+ echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
+ :
+ } || AC_MSG_ERROR([faild to make temporary directory])
AC_TRY_LINK([], [],
[AC_MSG_RESULT(yes)],
[
+ cd .. && rm -fr tmp.$$.try_link
AC_MSG_RESULT(no)
AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
]
)
+ cd .. && rm -fr tmp.$$.try_link
])
AC_DEFUN(RUBY_TRY_CFLAGS, [