diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:36 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-12 14:02:36 +0000 |
commit | 7a54bfe2e0fa3cb0f59bae50c4ee233fc21a4e66 (patch) | |
tree | 65bb6e303233cece7aaee48dc4f630d46a52febf | |
parent | f6895634a2cc4472538b50d902909deb27b9ff00 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Mar 10 12:27:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <jeg2@ruby-lang.org> * lib/csv.rb: Some minor documentation fixes from Gregory Brown. diff --git a/win32/Makefile.sub b/win32/Makefile.sub index e4a0e234c8..264652eb17 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 |