diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Wed Jul 18 14:53:21 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (EXTDLDFLAGS): split options for each extension + libraries, and unused in ruby.pc. [Bug #6734] + + * lib/mkmf.rb (MakeMakefile#configuration): add EXTDLDFLAGS. + Wed Jul 18 14:47:23 2012 Koichi Sasada <ko1@atdot.net> * thread.c: fix last commit miss. diff --git a/configure.in b/configure.in index 51ca44c0f6..1517993725 100644 --- a/configure.in +++ b/configure.in @@ -2282,7 +2282,7 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [aix*], [ : ${LDSHARED='$(CC)'} LDSHARED="$LDSHARED ${linker_flag}-G" - DLDFLAGS='-e$(TARGET_ENTRY)' + EXTDLDFLAGS='-e$(TARGET_ENTRY)' XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl" XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" : ${ARCHFILE="ruby.imp"} @@ -2294,7 +2294,8 @@ if test "$with_dln_a_out" != yes; then [beos*], [ AS_CASE(["$target_cpu"], [powerpc*], [ : ${LDSHARED='$(LD) -xms'} - DLDFLAGS="$DLDFLAGS "'-export $(TARGET_ENTRY) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + EXTDLDFLAGS='-export $(TARGET_ENTRY)' + DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot" ], [i586*], [ @@ -2307,7 +2308,8 @@ if test "$with_dln_a_out" != yes; then [haiku*], [ AS_CASE(["$target_cpu"], [powerpc*], [ : ${LDSHARED='$(LD) -xms'} - DLDFLAGS="$DLDFLAGS "'-export $(TARGET_ENTRY) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + EXTDLDFLAGS='-export $(TARGET_ENTRY)' + DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" ], [i586*], [ : ${LDSHARED='$(LD) -shared'} @@ -2928,6 +2930,7 @@ AC_SUBST(warnflags)dnl AC_SUBST(XCFLAGS)dnl AC_SUBST(XLDFLAGS)dnl AC_SUBST(EXTLDFLAGS)dnl +AC_SUBST(EXTDLDFLAGS)dnl AC_SUBST(LIBRUBY_LDSHARED) AC_SUBST(LIBRUBY_DLDFLAGS) AC_SUBST(RUBY_INSTALL_NAME) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 2fb0ba0e9f..85a372abaf 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1795,7 +1795,7 @@ DEFS = #{CONFIG['DEFS']} CPPFLAGS = #{extconf_h}#{$CPPFLAGS} CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']} ldflags = #{$LDFLAGS} -dldflags = #{$DLDFLAGS} +dldflags = #{$DLDFLAGS} #{CONFIG['EXTDLDFLAGS']} ARCH_FLAG = #{$ARCH_FLAG} DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG) LDSHARED = #{CONFIG['LDSHARED']} |