diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-14 13:51:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-14 13:51:19 +0000 |
| commit | 604689628dc64d050a68f1ebe5e06f9105474936 (patch) | |
| tree | 84a09689df2b995caae9e56689d050723718ed6d /lib/mkmf.rb | |
| parent | a1c02ee495d945f943fedc3f11fcb323289dc756 (diff) | |
* configure.in (LIBRUBY_A): append -static. [ruby-dev:18689]
* configure.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): linker
argument to link static/shared library respectively.
* Makefile.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): added.
* bcc32/Makefile.sub, win32/Makefile.sub: ditto.
* instruby.rb (LIBRUBY_A): install to libdir.
* lib/mkmf.rb (link_command): link static library of ruby, or
try_run fails unless LIBRUBY_SO is installed. [ruby-dev:18646]
* eval.c (call_trace_func): toplevel caller was missing.
[ruby-dev:18754]
* eval.c (proc_to_s): adjust created line number.
* parse.y (primary, do_block, brace_block): adjust line number of
block to beginning line, instead of the first statement inside
the block.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8566d3da3a..33ab04c7cb 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -211,7 +211,7 @@ def link_command(ldflags, opt="", libpath=$LIBPATH) 'LDFLAGS' => "#$LDFLAGS #{ldflags}", 'LIBPATH' => libpathflag(libpath), 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs", - 'LIBS' => "#$LIBRUBYARG #{opt} #$LIBS") + 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS") end def cc_command(opt="") @@ -558,6 +558,10 @@ VPATH = $(srcdir) end mk << %{ CC = #{CONFIG['CC']} +LIBRUBY = #{CONFIG['LIBRUBY']} +LIBRUBY_A = #{CONFIG['LIBRUBY_A']} +LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED +LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC CFLAGS = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS CPPFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{$CPPFLAGS} @@ -774,6 +778,8 @@ def init_mkmf(config = CONFIG) $OBJEXT = config["OBJEXT"].dup $LIBS = "#{config['LIBS']} #{config['DLDLIBS']}" $LIBRUBYARG = config['LIBRUBYARG'] + $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] + $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBPATH = [] $objs = nil |