1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of

checking whether CONFIG["configure-args"] includes "--enable-shared".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2002-11-04 11:06:03 +00:00
parent 6cff858589
commit cf1575f17d
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Mon Nov 4 20:03:53 2002 NAKAMURA Usaku <usa@ruby-lang.org>
* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
checking whether CONFIG["configure-args"] includes "--enable-shared".
Mon Nov 4 06:28:09 2002 Akinori MUSHA <knu@iDaemons.org>
* Makefile.in, ext/extmk.rb, bcc32/Makefile.sub,

View file

@ -68,7 +68,7 @@ sitelibdir = destdir+CONFIG["sitelibdir"]
sitearchlibdir = destdir+CONFIG["sitearchdir"]
mandir = destdir+CONFIG["mandir"] + "/man1"
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
enable_shared = configure_args.include?('--enable-shared')
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
dll = CONFIG["LIBRUBY_SO"]
lib = CONFIG["LIBRUBY"]
arc = CONFIG["LIBRUBY_A"]

View file

@ -778,7 +778,7 @@ def init_mkmf(config = CONFIG)
$objs = nil
$libs = ""
if $configure_args['--enable-shared'] or config["LIBRUBY"] != config["LIBRUBY_A"]
if config['ENABLE_SHARED'] == 'yes' or config["LIBRUBY"] != config["LIBRUBY_A"]
$LIBPATH = ["$(topdir)"]
$LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING
end