summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-24 16:43:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-05-24 16:43:45 +0000
commit32a75c9dcb00864e24acc5f8e76e987300addf27 (patch)
treeea01121cd763ec6e8d5d219afbc5d170f5711205
parent18cf07cc7cc9af85a5e6d0e35bc3c306c93729be (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--ext/extmk.rb7
2 files changed, 4 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ffe99c3c9..4905209ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+ * ext/extmk.rb: deal with $static set in extconf.rb.
+
Wed May 24 23:52:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* configure.in (ac_install_sh): ignore dummy install-sh.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index d0baa837e9..bb32e82f13 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -16,7 +16,6 @@ alias $PROGRAM_NAME $0
alias $0 $progname
$extlist = []
-$extupdate = false
$compiled = {}
$:.replace([Dir.pwd])
@@ -129,7 +128,6 @@ def extmake(target)
then
ok = false
init_mkmf
- $defs << "-DRUBY_EXPORT" if $static
Logging::logfile 'mkmf.log'
rm_f makefile
if File.exist?($0 = "#{$srcdir}/makefile.rb")
@@ -139,7 +137,7 @@ def extmake(target)
else
create_makefile(target)
end
- $extupdate = true
+ $defs << "-DRUBY_EXPORT" if $static
ok = File.exist?(makefile)
end
rescue SystemExit
@@ -471,9 +469,6 @@ Dir.chdir ".."
unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
-if !$extlist.empty? and $extupdate
- rm_f(RbConfig::CONFIG["LIBRUBY_SO"])
-end
puts "making #{rubies.join(', ')}"
$stdout.flush
$mflags.concat(rubies)