diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-02 04:02:20 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-12-02 04:02:20 +0000 |
commit | 9b69817ac0bfdd5b63ff7ac67905a4c1251b9496 (patch) | |
tree | 83dcdfad7014c8f6a52827616d873f3a3e06caa4 | |
parent | 6ec1902a2d0f83484cd3b0d046f29f8b1a0eb435 (diff) | |
download | ruby-9b69817ac0bfdd5b63ff7ac67905a4c1251b9496.tar.gz |
Revert r33926 "* configure.in: use $linker_flag for LDFLAGS option which is not"
This breaks build process of Linux and FreeBSD.
It may depend the version of gcc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 6 |
2 files changed, 3 insertions, 8 deletions
@@ -1,8 +1,3 @@ -Fri Dec 2 11:30:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in: use $linker_flag for LDFLAGS option which is not - limited to particular platforms. [ruby-core:41438] [Bug#5697] - Thu Dec 1 23:21:58 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> * thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if diff --git a/configure.in b/configure.in index eed4697687..e685913c33 100644 --- a/configure.in +++ b/configure.in @@ -2346,9 +2346,9 @@ AS_CASE("$enable_shared", [yes], [ [freebsd*|dragonfly*], [], [ if test "$GCC" = yes; then - RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no]) + RUBY_TRY_LDFLAGS([-Wl,--no-undefined], [no_undefined=yes], [no_undefined=no]) if test "no_undefined" = yes; then - RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined]) + RUBY_APPEND_OPTION(EXTLDFLAGS, [-Wl,--no-undefined]) fi fi ]) @@ -2441,7 +2441,7 @@ AS_CASE("$enable_shared", [yes], [ # enable PIE if possible if test "$GCC" = yes; then RUBY_TRY_CFLAGS(-fPIE, [RUBY_APPEND_OPTION(XCFLAGS, -fPIE) - RUBY_APPEND_OPTION(XLDFLAGS, ${linker_flag}-pie)]) + RUBY_APPEND_OPTION(XLDFLAGS, -pie)]) fi ]) if test "$enable_rpath" = yes; then |