1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (LIBRUBYARG_SHARED): shared library will not be

Browse Source 
created unless enable-shared.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-05-21 04:55:48 +00:00
parent 73997d38f4
commit 2b8fb39dcb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,7 @@
Fri May 21 13:35:55 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 21 13:55:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBRUBYARG_SHARED): shared library will not be
created unless enable-shared.
* ruby.c (ruby_init_loadpath_safe): use real path for non-shared * ruby.c (ruby_init_loadpath_safe): use real path for non-shared
build. build.

8
configure.in
View File

@ -2048,10 +2048,10 @@ ENABLE_SHARED=no
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]), AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
[enable_shared=$enableval]) [enable_shared=$enableval])
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
libprefix='$(libdir)' libprefix='$(libdir)'
if test "$enable_shared" = 'yes'; then AS_CASE("$enable_shared", [yes], [
LIBRUBY='$(LIBRUBY_SO)' LIBRUBY='$(LIBRUBY_SO)'
LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
LIBRUBYARG='$(LIBRUBYARG_SHARED)' LIBRUBYARG='$(LIBRUBYARG_SHARED)'
test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS" test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
ENABLE_SHARED=yes ENABLE_SHARED=yes
@ -2131,7 +2131,9 @@ if test "$enable_shared" = 'yes'; then
[interix*], [ [interix*], [
LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
]) ])
fi ], [
LIBRUBYARG_SHARED=
])
if test "$enable_rpath" = yes; then if test "$enable_rpath" = yes; then
LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)" LIBRUBY_RPATHFLAGS="${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"