diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-02 09:00:12 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-02 09:00:12 +0000 |
commit | 5c51ccc35c78651cfa98546fae06901db76c3265 (patch) | |
tree | 348f3873036103de615a8b00d0a9dcd2f738f179 /lib/mkmf.rb | |
parent | c0ab40c785d71c5b2b41c69731b61fe4ba9f8c0f (diff) | |
download | ruby-5c51ccc35c78651cfa98546fae06901db76c3265.tar.gz |
* ext/extmk.rb (extmake): extract necessary variables for static link
from Makefile.
* lib/mkmf.rb (create_makefile): save preload and libpath for next
compile.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index be6062829b..8dbd064930 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -803,7 +803,7 @@ def dummy_makefile(srcdir) CLEANFILES = #{$cleanfiles.join(' ')} DISTCLEANFILES = #{$distcleanfiles.join(' ')} -all install install-so install-rb: Makefile +all install static install-so install-rb: Makefile RULES end @@ -868,6 +868,8 @@ def create_makefile(target, srcprefix = nil) mfile = open("Makefile", "wb") mfile.print configuration(srcdir) mfile.print %{ +preload = #{$preload.join(" ") if $preload} +libpath = #{$LIBPATH.join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} @@ -915,9 +917,9 @@ static: $(STATIC_LIB) mfile.print CLEANINGS dirs = [] mfile.print "install: install-so install-rb\n\n" - if not $static and target - dirs << (dir = "$(RUBYARCHDIR)") - mfile.print("install-so: #{dir}\n") + dirs << (dir = "$(RUBYARCHDIR)") + mfile.print("install-so: #{dir}\n") + if target f = "$(DLLIB)" dest = "#{dir}/#{f}" mfile.print "install-so: #{dest}\n" |