ruby-changes:52122
From: nobu <ko1@a...>
Date: Mon, 13 Aug 2018 15:10:03 +0900 (JST)
Subject: [ruby-changes:52122] nobu:r64330 (trunk): configure.ac: use linker_flag to LIBRUBY_DLDFLAGS
nobu 2018-08-13 15:09:57 +0900 (Mon, 13 Aug 2018) New Revision: 64330 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64330 Log: 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. Modified files: trunk/configure.ac Index: configure.ac =================================================================== --- configure.ac (revision 64329) +++ configure.ac (revision 64330) @@ -3067,11 +3067,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3067 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"], https://github.com/ruby/ruby/blob/trunk/configure.ac#L3314 ]) ], [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], [ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/