From 46867f4cd681f604efffc42256504c8401183b69 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 25 Sep 2006 13:26:40 +0000 Subject: * lib/mkmf.rb (rm_f): get rid of NUL. * 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/trunk@11021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6caeef3d5..198765c8e 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -140,7 +140,7 @@ class Array end def rm_f(*files) - FileUtils.rm_f(Dir[files.join("\0")]) + FileUtils.rm_f(Dir[*files]) end def modified?(target, times) @@ -1433,7 +1433,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