diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 13:26:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 13:26:40 +0000 |
| commit | c7908b19b002ff26b35ff68ba6a21e9e06fd9827 (patch) | |
| tree | b3bb437c8c2b1d30e889c1b646490455215f3b5b | |
| parent | b96af08adda6e5e47088e7299567f8cb4cfb104b (diff) | |
| download | ruby-c7908b19b002ff26b35ff68ba6a21e9e06fd9827.tar.gz | |
* lib/mkmf.rb (rm_f): get rid of NUL.
* lib/mkmf.rb (init_mkmf): set default $LDFLAGS. Patch by Michal
Suchanek <hramrach at centrum.cz>. [ruby-talk:216256]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 8 insertions, 3 deletions
@@ -1,7 +1,12 @@ -Mon Sep 25 21:24:54 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Sep 25 22:26:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_path_end): skip root directory. fixed: [ruby-core:08913] + * lib/mkmf.rb (rm_f): get rid of NUL. + + * lib/mkmf.rb (init_mkmf): set default $LDFLAGS. Patch by Michal + Suchanek <hramrach at centrum.cz>. [ruby-talk:216256] + Mon Sep 25 21:24:54 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * sample/test.rb: "print nil" now prints empty string. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6caeef3d54..198765c8ef 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 |