From 3ceca8813616cce119de0b02f2a3a9fb9551cf75 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 25 Sep 2006 13:27:09 +0000 Subject: * lib/mkmf.rb (init_mkmf): set default $LDFLAGS. Patch by Michal Suchanek . [ruby-talk:216256] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/mkmf.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49ade0859..a659192cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -Mon Sep 25 21:24:54 2006 Nobuyoshi Nakada +Mon Sep 25 22:26:26 2006 Nobuyoshi Nakada * file.c (rb_path_end): skip root directory. fixed: [ruby-core:08913] + * lib/mkmf.rb (init_mkmf): set default $LDFLAGS. Patch by Michal + Suchanek . [ruby-talk:216256] + Mon Sep 25 21:24:54 2006 Yukihiro Matsumoto * array.c (rb_ary_shift): should clear shifting top element. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 36824903e..e2be086f3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1419,7 +1419,7 @@ def init_mkmf(config = CONFIG) $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup - $LDFLAGS = (with_config("ldflags") || "").dup + $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)" $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup $LIBEXT = config['LIBEXT'].dup -- cgit