1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (LIBPATHFLAG): avoid $ substitution.

Browse Source 
[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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-10-24 12:58:42 +00:00
parent 9c33e18ca0
commit d45f226da9
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -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 * bcc32/Makefile.sub (.rc.res): directory part may be empty in
Borland make. Borland make.

2
configure.in
View File

@ -779,7 +779,7 @@ if test "$with_dln_a_out" != yes; then
netbsd*) LDSHARED='${CC} -shared' netbsd*) LDSHARED='${CC} -shared'
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="-Wl,-export-dynamic" LDFLAGS="-Wl,-export-dynamic"
LIBPATHFLAG=' -L%1$$s -Wl,-R%1$$s' LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s'
fi fi
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"

2
ext/extmk.rb
View File

@ -50,7 +50,7 @@ def extmake(target)
$srcdir = File.join($top_srcdir, "ext", $mdir) $srcdir = File.join($top_srcdir, "ext", $mdir)
unless $ignore unless $ignore
if $static || if $static ||
older("./Makefile", *MTIMES + %w"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb") older("./Makefile", *MTIMES + %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb")
then then
$defs = [] $defs = []
Logging::logfile 'mkmf.log' Logging::logfile 'mkmf.log'

8
ext/win32ole/extconf.rb
View File

@ -17,10 +17,8 @@ end
case RUBY_PLATFORM case RUBY_PLATFORM
when /mswin32/ when /mswin32/
$CFLAGS='/W3' $CFLAGS += ' /W3'
when /mingw/ when /cygwin/, /mingw/
$CFLAGS='-DNONAMELESSUNION' $defs << '-DNONAMELESSUNION'
when /cygwin/
$CFLAGS='-DNONAMELESSUNION'
end end
create_win32ole_makefile create_win32ole_makefile

4
lib/mkmf.rb
View File

@ -820,8 +820,8 @@ Config::CONFIG["topdir"] = CONFIG["topdir"] =
$configure_args["--topdir"] ||= $curdir $configure_args["--topdir"] ||= $curdir
$ruby = arg_config("--ruby", CONFIG["ruby_install_name"]) $ruby = arg_config("--ruby", CONFIG["ruby_install_name"])
def config_string(key) def config_string(key, config = CONFIG)
return unless s = CONFIG[key] and !s.empty? return unless s = config[key] and !s.empty?
return s unless block_given? return s unless block_given?
yield s yield s
end end