diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-04 11:06:03 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-04 11:06:03 +0000 |
| commit | a364cba4874c282b5a4ccd586ad473a56ac58d86 (patch) | |
| tree | f79bf2cca4745e9f187471f9cf537fac284448db | |
| parent | 5e71748f393bc9eee345c588244624d2f79daef3 (diff) | |
| download | ruby-a364cba4874c282b5a4ccd586ad473a56ac58d86.tar.gz ruby-a364cba4874c282b5a4ccd586ad473a56ac58d86.tar.xz ruby-a364cba4874c282b5a4ccd586ad473a56ac58d86.zip | |
* instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
checking whether CONFIG["configure-args"] includes "--enable-shared".
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | instruby.rb | 2 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -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, diff --git a/instruby.rb b/instruby.rb index 48a0e4cf3..84aa430d4 100644 --- a/instruby.rb +++ b/instruby.rb @@ -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"] diff --git a/lib/mkmf.rb b/lib/mkmf.rb index fc41eebb4..8566d3da3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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 |