diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-20 21:45:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-04-20 21:45:43 +0000 |
| commit | dbbfbc5a21dec443bd0234f89d739129cff4d0a5 (patch) | |
| tree | ffc894cde7f7ca1a2ab6ef1898a294221c98e73a /configure.in | |
| parent | 756a1c457e8b5243c6fb09fa0aa8c71f5ca78646 (diff) | |
* configure.in, lib/mkmf.rb, {bcc32,win32,wince}/Makefile.sub: improve
C++ support. [ruby-dev:26089]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.in b/configure.in index be313d5989..2abe9454e3 100644 --- a/configure.in +++ b/configure.in @@ -147,6 +147,7 @@ if test x"${build}" != x"${host}"; then AC_CHECK_TOOL(CC, gcc) fi AC_PROG_CC +AC_PROG_CXX AC_PROG_GCC_TRADITIONAL RUBY_PROG_GNU_LD @@ -800,6 +801,7 @@ AC_SUBST(ARCH_FLAG)dnl AC_SUBST(STATIC)dnl AC_SUBST(CCDLFLAGS)dnl AC_SUBST(LDSHARED)dnl +AC_SUBST(LDSHAREDXX)dnl AC_SUBST(DLEXT)dnl AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl @@ -951,6 +953,22 @@ if test "$with_dln_a_out" != yes; then RPATHFLAG=" -Wl,-R'%1\$-s'" fi fi +if test "${LDSHAREDXX}" = ""; then + case "${LDSHARED}" in + *'$(CC)'*) + LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'` + ;; + *'${CC}'*) + LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'` + ;; + *$CC*) + LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"` + ;; + ld" "*) + ;; + esac +fi + AC_SUBST(LINK_SO) AC_SUBST(LIBPATHFLAG) AC_SUBST(RPATHFLAG) |