зеркало из https://github.com/github/ruby.git
* ext/extmk.rb: deal with $static set in extconf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
18cf07cc7c
Коммит
32a75c9dcb
|
@ -1,7 +1,9 @@
|
||||||
Thu May 25 00:51:18 2006 nobuyoshi nakada <nobu@ruby-lang.org>
|
Thu May 25 01:43:30 2006 nobuyoshi nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* lib/mkmf.rb (pkg_config): particular config commands support.
|
* lib/mkmf.rb (pkg_config): particular config commands support.
|
||||||
|
|
||||||
|
* ext/extmk.rb: deal with $static set in extconf.rb.
|
||||||
|
|
||||||
Wed May 24 23:52:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
|
Wed May 24 23:52:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* configure.in (ac_install_sh): ignore dummy install-sh.
|
* configure.in (ac_install_sh): ignore dummy install-sh.
|
||||||
|
|
|
@ -16,7 +16,6 @@ alias $PROGRAM_NAME $0
|
||||||
alias $0 $progname
|
alias $0 $progname
|
||||||
|
|
||||||
$extlist = []
|
$extlist = []
|
||||||
$extupdate = false
|
|
||||||
$compiled = {}
|
$compiled = {}
|
||||||
|
|
||||||
$:.replace([Dir.pwd])
|
$:.replace([Dir.pwd])
|
||||||
|
@ -129,7 +128,6 @@ def extmake(target)
|
||||||
then
|
then
|
||||||
ok = false
|
ok = false
|
||||||
init_mkmf
|
init_mkmf
|
||||||
$defs << "-DRUBY_EXPORT" if $static
|
|
||||||
Logging::logfile 'mkmf.log'
|
Logging::logfile 'mkmf.log'
|
||||||
rm_f makefile
|
rm_f makefile
|
||||||
if File.exist?($0 = "#{$srcdir}/makefile.rb")
|
if File.exist?($0 = "#{$srcdir}/makefile.rb")
|
||||||
|
@ -139,7 +137,7 @@ def extmake(target)
|
||||||
else
|
else
|
||||||
create_makefile(target)
|
create_makefile(target)
|
||||||
end
|
end
|
||||||
$extupdate = true
|
$defs << "-DRUBY_EXPORT" if $static
|
||||||
ok = File.exist?(makefile)
|
ok = File.exist?(makefile)
|
||||||
end
|
end
|
||||||
rescue SystemExit
|
rescue SystemExit
|
||||||
|
@ -471,9 +469,6 @@ Dir.chdir ".."
|
||||||
unless $destdir.to_s.empty?
|
unless $destdir.to_s.empty?
|
||||||
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
|
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
|
||||||
end
|
end
|
||||||
if !$extlist.empty? and $extupdate
|
|
||||||
rm_f(RbConfig::CONFIG["LIBRUBY_SO"])
|
|
||||||
end
|
|
||||||
puts "making #{rubies.join(', ')}"
|
puts "making #{rubies.join(', ')}"
|
||||||
$stdout.flush
|
$stdout.flush
|
||||||
$mflags.concat(rubies)
|
$mflags.concat(rubies)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче