diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | ext/extmk.rb | 2 | ||||
| -rw-r--r-- | ext/win32ole/extconf.rb | 8 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
5 files changed, 18 insertions, 10 deletions
@@ -1,4 +1,14 @@ -Thu Oct 24 14:27:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> +Thu Oct 24 21:57:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * configure.in (LIBPATHFLAG): avoid $ substitution. + [ruby-dev:18577] + + * ext/extmk.rb (extmake): expand $srcdir. + + * ext/win32ole/extconf.rb: should not override $CFLAGS, but + append. + + * lib/mkmf.rb (config_string): use given config hash. * bcc32/Makefile.sub (.rc.res): directory part may be empty in Borland make. diff --git a/configure.in b/configure.in index e4e8507878..0e4bc356e6 100644 --- a/configure.in +++ b/configure.in @@ -779,7 +779,7 @@ if test "$with_dln_a_out" != yes; then netbsd*) LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" - LIBPATHFLAG=' -L%1$$s -Wl,-R%1$$s' + LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s' fi rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" diff --git a/ext/extmk.rb b/ext/extmk.rb index c98afdf440..e43638326a 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -50,7 +50,7 @@ def extmake(target) $srcdir = File.join($top_srcdir, "ext", $mdir) unless $ignore if $static || - older("./Makefile", *MTIMES + %w"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb") + older("./Makefile", *MTIMES + %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb") then $defs = [] Logging::logfile 'mkmf.log' diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb index f627fcabb4..c0dfd4c724 100644 --- a/ext/win32ole/extconf.rb +++ b/ext/win32ole/extconf.rb @@ -17,10 +17,8 @@ end case RUBY_PLATFORM when /mswin32/ - $CFLAGS='/W3' -when /mingw/ - $CFLAGS='-DNONAMELESSUNION' -when /cygwin/ - $CFLAGS='-DNONAMELESSUNION' + $CFLAGS += ' /W3' +when /cygwin/, /mingw/ + $defs << '-DNONAMELESSUNION' end create_win32ole_makefile diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1f0ef5d370..b20a06cddf 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -820,8 +820,8 @@ Config::CONFIG["topdir"] = CONFIG["topdir"] = $configure_args["--topdir"] ||= $curdir $ruby = arg_config("--ruby", CONFIG["ruby_install_name"]) -def config_string(key) - return unless s = CONFIG[key] and !s.empty? +def config_string(key, config = CONFIG) + return unless s = config[key] and !s.empty? return s unless block_given? yield s end |