aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-20 07:00:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-20 07:00:56 +0000
commitb0381a4b1f59bb2815393145be001cc239fc541e (patch)
treea508bb601b9b56d0576d788a02f5cb615394694e
parent804151d199e96a940a2aec93e757be2322624fc2 (diff)
downloadruby-b0381a4b1f59bb2815393145be001cc239fc541e.tar.gz
configure.in: use RUBY_APPEND_OPTIONS
* configure.in: DLDFLAGS is defined in --with-opt-dir handler, so ${DLDFLAGS=} does not work now. use RUBY_APPEND_OPTIONS instead. [ruby-dev:47855] [Bug #9256] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7962ff7cf7..dfaadc5843 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 20 16:00:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in: DLDFLAGS is defined in --with-opt-dir handler, so
+ ${DLDFLAGS=} does not work now. use RUBY_APPEND_OPTIONS instead.
+ [ruby-dev:47855] [Bug #9256]
+
Fri Dec 20 14:19:12 2013 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in (AC_ARG_WITH): use withval directly.
diff --git a/configure.in b/configure.in
index f5b1977c06..ea14b941ed 100644
--- a/configure.in
+++ b/configure.in
@@ -2667,7 +2667,10 @@ if test "$with_dln_a_out" != yes; then
fi
rb_cv_dlopen=yes],
[darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'}
- : ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress"}
+ RUBY_APPEND_OPTIONS(DLDFLAGS, [ \
+ "${linker_flag}-undefined${linker_flag:+,}dynamic_lookup" \
+ "${linker_flag}-multiply_defined${linker_flag:+,}suppress" \
+ ])
: ${LDFLAGS=""}
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
# /usr/local/include is always searched for