[前][次][番号順一覧][スレッド一覧]

ruby-changes:15152

From: nobu <ko1@a...>
Date: Wed, 24 Mar 2010 18:16:34 +0900 (JST)
Subject: [ruby-changes:15152] Ruby:r27031 (ruby_1_8, trunk): * configure.in (LDSHARED, CPP): keep $(CC). 

nobu	2010-03-24 18:16:13 +0900 (Wed, 24 Mar 2010)

  New Revision: 27031

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27031

  Log:
    * configure.in (LDSHARED, CPP): keep $(CC).  [ruby-core:28912]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 27030)
+++ configure.in	(revision 27031)
@@ -1708,27 +1708,27 @@
 			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 @@
 			  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 @@
 			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"
 			],
@@ -1839,6 +1839,7 @@
 	[ld" "*], [
 	    ])
 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'}])
 
 AC_SUBST(LINK_SO)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27030)
+++ ChangeLog	(revision 27031)
@@ -1,3 +1,7 @@
+Wed Mar 24 18:16:08 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LDSHARED, CPP): keep $(CC).  [ruby-core:28912]
+
 Wed Mar 24 14:33:56 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (rb_w32_read): limit read size to 16KB if the file
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 27030)
+++ ruby_1_8/configure.in	(revision 27031)
@@ -1226,20 +1226,20 @@
 	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 @@
 			  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 @@
 			: ${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 @@
   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'};;
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27030)
+++ ruby_1_8/ChangeLog	(revision 27031)
@@ -1,3 +1,7 @@
+Wed Mar 24 18:16:08 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LDSHARED, CPP): keep $(CC).  [ruby-core:28912]
+
 Mon Mar 22 19:32:34 2010  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date.rb (Date#>>): fixed.  [ruby-core:28011]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 27030)
+++ ruby_1_8/version.h	(revision 27031)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-03-22"
+#define RUBY_RELEASE_DATE "2010-03-24"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100322
+#define RUBY_RELEASE_CODE 20100324
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]