diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 13:27:09 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-25 13:27:09 +0000 |
| commit | 1dbee5b19da19c5d9b8c69be85498da771c7f5e1 (patch) | |
| tree | 2b8449799f6023da7e80826f5cfa8de57afa2538 | |
| parent | f3925d5ae05aad612ef9a52d6e3f49df2e480bf9 (diff) | |
* 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/branches/ruby_1_8@11022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -1,7 +1,10 @@ -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 (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> * array.c (rb_ary_shift): should clear shifting top element. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 36824903ed..e2be086f3b 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 |