From 02d28d01cf4a70ad8f5902d5a5eaa103a74103cf Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Oct 2013 03:22:24 +0000 Subject: ruby.c: gem_prelude to load rubygems * ruby.c (process_options): use gem_prelude instead of requiring rubygems directly when --enable=gems is given. * Makefile.in (DEFAULT_PRELUDES): always use gem_prelude regardless of --disable-rubygems. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 52784f96b2..b8735a1ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2013-10-14 Nobuyoshi Nakada + * ruby.c (process_options): use gem_prelude instead of requiring + rubygems directly when --enable=gems is given. + + * Makefile.in (DEFAULT_PRELUDES): always use gem_prelude regardless of + --disable-rubygems. + * lib/mkmf.rb (have_framework): should append framework options to $LIBS, not $LDFLAGS. the former is propagated to exts.mk when enable-static-linked-ext. -- cgit v1.2.3