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

* configure.in: revert the previous commit, which seemed to break make

Browse Source 
install.  The files of standard libraries are directly installed to
  $(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27032 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-03-24 14:01:57 +00:00
parent 91e6d01790
commit 30a4825aea
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Mar 24 22:58:02 2010 Yusuke Endoh <mame@tsg.ne.jp>
* configure.in: revert the previous commit, which seemed to break make
install. The files of standard libraries are directly installed to
$(PREFIX)/lib/ruby instead of $(PREFIX)/lib/ruby/1.9.1
Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Mar 24 18:16:08 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912] * configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912]

25
configure.in
View File

@ -1708,27 +1708,27 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[sysv4*], [ : ${LDSHARED='ld -G'} [sysv4*], [ : ${LDSHARED='ld -G'}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[nto-qnx*], [ : ${LDSHARED='$(CC) -shared'} [nto-qnx*], [ : ${LDSHARED="qcc -shared"}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[esix*|uxpds*], [ : ${LDSHARED="ld -G"} [esix*|uxpds*], [ : ${LDSHARED="ld -G"}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""} [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[bsdi3*], [ AS_CASE(["$CC"], [bsdi3*], [ AS_CASE(["$CC"],
[*shlicc*], [ : ${LDSHARED='$(CC) -r'} [*shlicc*], [ : ${LDSHARED="$CC -r"}
rb_cv_dlopen=yes])], rb_cv_dlopen=yes])],
[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED='${CC} -shared'}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-export-dynamic" LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
fi fi
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[interix*], [ : ${LDSHARED='$(CC) -shared'} [interix*], [ : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E" XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L%1\$-s" LIBPATHFLAG=" -L%1\$-s"
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[freebsd*|dragonfly*], [ [freebsd*|dragonfly*], [
: ${LDSHARED='$(CC) -shared'} : ${LDSHARED="$CC -shared"}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -rdynamic" LDFLAGS="$LDFLAGS -rdynamic"
DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
@ -1736,18 +1736,18 @@ if test "$with_dln_a_out" != yes; then
test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
fi fi
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} [openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -Wl,-E" LDFLAGS="$LDFLAGS -Wl,-E"
fi fi
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'} [nextstep*], [ : ${LDSHARED='cc -r -nostdlib'}
LDFLAGS="$LDFLAGS -u libsys_s" LDFLAGS="$LDFLAGS -u libsys_s"
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} [openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} [rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'}
@ -1812,13 +1812,13 @@ if test "$with_dln_a_out" != yes; then
LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[cygwin*|mingw*], [ [cygwin*|mingw*], [
: ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'} : ${LDSHARED="${CC} -shared "'$(if $(filter-out -g -g0,$(debugflags)),,-s)'}
XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
: ${LIBPATHENV=""} : ${LIBPATHENV=""}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[hiuxmpp], [ : ${LDSHARED='ld -r'}], [hiuxmpp], [ : ${LDSHARED='ld -r'}],
[atheos*], [ : ${LDSHARED='$(CC) -shared'} [atheos*], [ : ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf"
], ],
@ -1839,7 +1839,6 @@ if test "${LDSHAREDXX}" = ""; then
[ld" "*], [ [ld" "*], [
]) ])
fi fi
AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`])
AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}]) AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
AC_SUBST(LINK_SO) AC_SUBST(LINK_SO)