diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 20:44:45 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 20:44:45 +0000 |
| commit | da8a31bc47294936806479b25d60b8d823df8c47 (patch) | |
| tree | 8711ba3551157e912c7c8fc8890873693dc2936e /configure.in | |
| parent | 2ca764948cbba0c0f3917cf16e6c0917c8765836 (diff) | |
* configure.in (ruby_version): needs runnable CPP.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/configure.in b/configure.in index ae1fb42099..d195f7521a 100644 --- a/configure.in +++ b/configure.in @@ -1708,27 +1708,27 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes], [sysv4*], [ : ${LDSHARED='ld -G'} rb_cv_dlopen=yes], - [nto-qnx*], [ : ${LDSHARED="qcc -shared"} - rb_cv_dlopen=yes], + [nto-qnx*], [ : ${LDSHARED='$(CC) -shared'} + rb_cv_dlopen=yes], [esix*|uxpds*], [ : ${LDSHARED="ld -G"} rb_cv_dlopen=yes], [osf*], [ : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes], [bsdi3*], [ AS_CASE(["$CC"], - [*shlicc*], [ : ${LDSHARED="$CC -r"} + [*shlicc*], [ : ${LDSHARED='$(CC) -r'} rb_cv_dlopen=yes])], [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ - : ${LDSHARED='${CC} -shared'} + : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" fi rb_cv_dlopen=yes], - [interix*], [ : ${LDSHARED="$CC -shared"} + [interix*], [ : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L%1\$-s" rb_cv_dlopen=yes], [freebsd*|dragonfly*], [ - : ${LDSHARED="$CC -shared"} + : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" 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" fi rb_cv_dlopen=yes], - [openbsd*], [ : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} + [openbsd*], [ : ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-E" fi rb_cv_dlopen=yes], - [nextstep*], [ : ${LDSHARED='cc -r -nostdlib'} + [nextstep*], [ : ${LDSHARED='$(CC) -r -nostdlib'} LDFLAGS="$LDFLAGS -u libsys_s" rb_cv_dlopen=yes], - [openstep*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} + [openstep*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], - [rhapsody*], [ : ${LDSHARED='cc -dynamic -bundle -undefined suppress'} + [rhapsody*], [ : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress'} : ${LDFLAGS=""} rb_cv_dlopen=yes], [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" rb_cv_dlopen=yes], [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" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" : ${LIBPATHENV=""} rb_cv_dlopen=yes], [hiuxmpp], [ : ${LDSHARED='ld -r'}], - [atheos*], [ : ${LDSHARED="$CC -shared"} + [atheos*], [ : ${LDSHARED='$(CC) -shared'} rb_cv_dlopen=yes], [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" ], @@ -2560,6 +2560,8 @@ PACKAGE=$RUBY_BASE_NAME AC_SUBST(PACKAGE) 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(Makefile, [{ if test -d "$srcdir/.svn"; then |