diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 09:16:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-24 09:16:13 +0000 |
| commit | b7257e27cc7c6099b86d12ee3eb40beb705ea186 (patch) | |
| tree | 81997caa3e1b153a86db6a201d3f8dd7396e6f05 /configure.in | |
| parent | dcd49e3b3acf752f3011a6dbb2bad3269b05d3ab (diff) | |
* configure.in (LDSHARED, CPP): keep $(CC). [ruby-core:28912]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27031 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/configure.in b/configure.in index cfbd7a39aa..c1a325da91 100644 --- a/configure.in +++ b/configure.in @@ -1226,20 +1226,20 @@ if test "$with_dln_a_out" != yes; then osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in - *shlicc*) : ${LDSHARED="$CC -r"} + *shlicc*) : ${LDSHARED='$(CC) -r'} rb_cv_dlopen=yes ;; esac ;; linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*) - : ${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"} + freebsd*|dragonfly*) : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -1247,7 +1247,7 @@ 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 @@ -1311,13 +1311,13 @@ if test "$with_dln_a_out" != yes; then : ${LDSHARED='ld -Bshareable -x'} 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)'} + cygwin*|mingw*) : ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'} XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all" : ${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" ;; @@ -1325,6 +1325,7 @@ if test "$with_dln_a_out" != yes; then esac AC_MSG_RESULT($rb_cv_dlopen) fi +case " $CPP " in *" $CC "*) CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`;; esac case ${RPATHFLAG} in *'%1$'*) : ${LIBPATHFLAG=' -L%1$-s'};; |