From 33419cba1cd8c17f380c129b03250af72566159a Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Apr 2009 14:02:36 +0000 Subject: merges r22869 from trunk into ruby_1_9_1. -- * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so that extconf.rb could refer it. [ruby-core:22725] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/Makefile.sub | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d24c37f3..16f5ec6de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 10 12:27:52 2009 Nobuyoshi Nakada + + * win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so + that extconf.rb could refer it. [ruby-core:22725] + Wed Mar 4 05:19:27 2009 James Edward Gray II * lib/csv.rb: Some minor documentation fixes from Gregory Brown. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e4a0e234c..264652eb1 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -532,7 +532,7 @@ s,@DEFS@,$(DEFS),;t t s,@CPPFLAGS@,$(CPPFLAGS),;t t s,@CXXFLAGS@,$(CXXFLAGS),;t t s,@FFLAGS@,$(FFLAGS),;t t -s,@LDFLAGS@,,;t t +s,@LDFLAGS@,$(LDFLAGS),;t t s,@LIBS@,$(LIBS),;t t s,@exec_prefix@,$${prefix},;t t s,@prefix@,$(prefix),;t t -- cgit