From 2faf9e4991e8eb9735a3bf3531af78d53f480a5c Mon Sep 17 00:00:00 2001 From: eban Date: Thu, 12 Dec 2002 10:21:41 +0000 Subject: * configure.in (RUBY_PROG_GNU_LD): add $CFLAGS, $CPPFLAGS, $LDFLAGS to the option of $CC. * configure.in: set LIBRUBYARG to '-l$(RUBY_SO_NAME)' if the target os is cygwin and --disable-shared option is supplied. * lib/mkmf.rb (init_mkmf): expand config["LIBRUBY"] and config["LIBRUBY_A"]. don't link $LIBRUBYARG_STATIC if --disable-shared option is supplied. * configure.in (RUBY_CPPOUTFILE): should be a better message. * ext/Win32API/extconf.rb: join with a space. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 42d96ef59..bf661346b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -767,6 +767,7 @@ all: $(DLLIB) end def init_mkmf(config = CONFIG) + $enable_shared = config['ENABLE_SHARED'] == 'yes' $defs = [] $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup @@ -776,16 +777,17 @@ def init_mkmf(config = CONFIG) $LIBEXT = config['LIBEXT'].dup $OBJEXT = config["OBJEXT"].dup $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}" - $LIBRUBYARG = config['LIBRUBYARG'] + $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBPATH = [] $objs = nil $libs = "" - if config['ENABLE_SHARED'] == 'yes' or config["LIBRUBY"] != config["LIBRUBY_A"] + if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup) $LIBPATH = ["$(topdir)"] $LIBPATH.unshift("$(libdir)") unless $extmk or defined? CROSS_COMPILING + $LIBRUBYARG = config['LIBRUBYARG'] end $LIBPATH << "$(archdir)" -- cgit