diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 07:55:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 07:55:43 +0000 |
| commit | 0efd00bf4f5a9dc89da3e11b1508a23fef496487 (patch) | |
| tree | 5cef5454106a609a0c1f23cd8fddd9a19617c223 | |
| parent | cc1c60591297589db8c01cd3face26f0b3d56fc3 (diff) | |
Re-apply wrongly reverted r64330
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 30d6afa9ce..984a585bd4 100644 --- a/configure.ac +++ b/configure.ac @@ -3070,11 +3070,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)' LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)' LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)' - AS_IF([test "$GCC" = yes], [ - LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)' - ], [ - LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)' - ]) + RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)']) XLDFLAGS="$XLDFLAGS "'-R${libdir}' ], [hpux*], [ @@ -3321,7 +3317,7 @@ AS_CASE(["$target_os"], ]) ], [cygwin*|mingw*], [ - LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' + LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' AS_CASE(["$target_os"], [cygwin*], [ AS_IF([test x"$enable_shared" = xyes], [ |