1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in (ruby_version): needs runnable CPP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-03-24 20:44:45 +00:00
parent 2ca764948c
commit da8a31bc47
2 changed files with 18 additions and 12 deletions

View file

@ -1,3 +1,7 @@
Thu Mar 25 05:44:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ruby_version): needs runnable CPP.
Thu Mar 25 04:42:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Mar 25 04:42:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/make-snapshot (package): take a breath for HP-UX make * tool/make-snapshot (package): take a breath for HP-UX make

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="qcc -shared"} [nto-qnx*], [ : ${LDSHARED='$(CC) -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"
], ],
@ -2560,6 +2560,8 @@ PACKAGE=$RUBY_BASE_NAME
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
AC_MSG_RESULT($PACKAGE library version = $ruby_version) AC_MSG_RESULT($PACKAGE library version = $ruby_version)
AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`])
AC_CONFIG_FILES($FIRSTMAKEFILE) AC_CONFIG_FILES($FIRSTMAKEFILE)
AC_CONFIG_FILES(Makefile, [{ AC_CONFIG_FILES(Makefile, [{
if test -d "$srcdir/.svn"; then if test -d "$srcdir/.svn"; then