nobu	2016-10-22 10:28:30 +0900 (Sat, 22 Oct 2016)

  New Revision: 56472

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56472

  Log:
    configure.in: fallback DLDFLAGS to LDFLAGS
    
    * configure.in (DLDFLAGS): fallback to LDFLAGS.
      [ruby-core:72444] [Bug #11863]
    * configure.in (LIBRUBY_DLDFLAGS): fallback to DLDFLAGS.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56471)
+++ ChangeLog	(revision 56472)
@@ -1,4 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Sat Oct 22 10:27:01 2016  Nobuyoshi Nakada  <nobu@r...>
+Sat Oct 22 10:28:28 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (DLDFLAGS): fallback to LDFLAGS.
+	  [ruby-core:72444] [Bug #11863]
+
+	* configure.in (LIBRUBY_DLDFLAGS): fallback to DLDFLAGS.
 
 	* configure.in (RUBY_APPEND_OPTION, RUBY_PREPEND_OPTION): expand
 	  the option to be appended/prepended when matching, as well as
Index: configure.in
===================================================================
--- configure.in	(revision 56471)
+++ configure.in	(revision 56472)
@@ -804,6 +804,8 @@ AC_DEFUN([RUBY_TRY_LDFLAGS], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L804
     save_LDFLAGS=
 ])
 
+: ${DLDFLAGS="$LDFLAGS"}
+
 AS_CASE([$RUBY_PATCHLEVEL], [-*],
 	[particular_werror_flags=yes], [particular_werror_flags=no])
 AC_ARG_ENABLE(werror,
@@ -3823,7 +3825,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3825
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	],
     [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"])
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	if test "$load_relative" = yes; then
 	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
@@ -3842,7 +3844,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3844
     [netbsd*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"])
 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
 	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 	else	# a.out platforms
@@ -3870,7 +3872,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3872
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
 	],
     [aix*], [
-	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
+	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
 	],
@@ -3900,10 +3902,6 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3902
     [mingw*|cygwin*|mswin*], [
 	LIBRUBY_RELATIVE=yes
 	])
-
-    if test "x$compress_debug_sections" = xyes; then
-	RUBY_APPEND_OPTION(LIBRUBY_DLDFLAGS, ${linker_flag}--compress-debug-sections=zlib)
-    fi
 ], [
   LIBRUBYARG_SHARED=
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/