mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
use LIBEXT
* Makefile.in (LIBEXT): add macro. * configure.in (ENCOBJS, EXTOBJS): use LIBEXT, not hardcoded suffix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
2278902a76
commit
0a6700fec2
3 changed files with 8 additions and 3 deletions
|
@ -1,4 +1,8 @@
|
|||
Sat May 19 11:34:32 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Sat May 19 11:35:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in (LIBEXT): add macro.
|
||||
|
||||
* configure.in (ENCOBJS, EXTOBJS): use LIBEXT, not hardcoded suffix.
|
||||
|
||||
* Makefile.in (LIBRUBY_A): fix typo. re-applying r35242.
|
||||
|
||||
|
|
|
@ -84,6 +84,7 @@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
|||
RUBY_SO_NAME=@RUBY_SO_NAME@
|
||||
RUBY_RELEASE_DATE=@RUBY_RELEASE_DATE@
|
||||
EXEEXT = @EXEEXT@
|
||||
LIBEXT = @LIBEXT@
|
||||
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
|
||||
RUBY = $(RUBY_INSTALL_NAME)
|
||||
MINIRUBY = @MINIRUBY@\
|
||||
|
|
|
@ -2420,8 +2420,8 @@ AC_ARG_WITH(static-linked-ext,
|
|||
AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
|
||||
[AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
|
||||
if test x"$EXTSTATIC" = xstatic; then
|
||||
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.a enc/libtrans.a'
|
||||
EXTOBJS='ext/extinit.$(OBJEXT) ext/libext.a'
|
||||
ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
|
||||
EXTOBJS='ext/extinit.$(OBJEXT) ext/libext.$(LIBEXT)'
|
||||
AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
|
||||
fi
|
||||
AC_SUBST(ENCOBJS)
|
||||
|
|
Loading…
Reference in a new issue