diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 06:09:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 06:09:57 +0000 |
| commit | 2c4af6843d8ea26558ef6f6d1702aa1a548bdf9f (patch) | |
| tree | 8021039e5690441f1ea8510641f1039e31043df4 /configure.ac | |
| parent | 255c3d977e125d775f7e7ab9b44d681c33d31183 (diff) | |
| download | ruby-2c4af6843d8ea26558ef6f6d1702aa1a548bdf9f.tar.gz | |
configure.ac: use linker_flag to LIBRUBY_DLDFLAGS
* configure.ac: use a feature flag `linker_flag`, than checking if the
compiler is `GCC`.
* configure.ac: append to LIBRUBY_DLDFLAGS once after initialized with
DLDFLAGS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 358acbe261..c5baa8c980 100644 --- a/configure.ac +++ b/configure.ac @@ -3067,11 +3067,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*], [ @@ -3318,7 +3314,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], [ |