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

ruby-changes:18263

From: nobu <ko1@a...>
Date: Tue, 21 Dec 2010 12:45:30 +0900 (JST)
Subject: [ruby-changes:18263] Ruby:r30286 (trunk): * configure.in (target_archs): remove temporary objects.

nobu	2010-12-21 12:45:21 +0900 (Tue, 21 Dec 2010)

  New Revision: 30286

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

  Log:
    * configure.in (target_archs): remove temporary objects.
    * enc/Makefile.in, enc/depend (clean): remove work directories.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/enc/Makefile.in
    trunk/enc/depend

Index: configure.in
===================================================================
--- configure.in	(revision 30285)
+++ configure.in	(revision 30286)
@@ -194,8 +194,8 @@
     else
 	if test x"$target_cpu" != x"${target_archs}"; then
 	    echo 'int main(){return 0;}' > conftest.c
-	    if $CC $CFLAGS $ARCH_FLAG conftest.c > /dev/null 2>&1; then
-		rm -f conftest.* a.out
+	    if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
+		rm -fr conftest.*
 	    else
 		RUBY_DEFAULT_ARCH("$target_archs")
 	    fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30285)
+++ ChangeLog	(revision 30286)
@@ -1,3 +1,9 @@
+Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (target_archs): remove temporary objects.
+
+	* enc/Makefile.in, enc/depend (clean): remove work directories.
+
 Tue Dec 21 07:39:12 2010  Tanaka Akira  <akr@f...>
 
 	* pack.c: parenthesize macro arguments.
Index: enc/Makefile.in
===================================================================
--- enc/Makefile.in	(revision 30285)
+++ enc/Makefile.in	(revision 30286)
@@ -51,7 +51,7 @@
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
 RUBY     = $(MINIRUBY)
 
-WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans
+WORKDIRS = @WORKDIRS@
 
 RM = @RM@
 RMDIR = @RMDIR@
Index: enc/depend
===================================================================
--- enc/depend	(revision 30285)
+++ enc/depend	(revision 30286)
@@ -1,3 +1,5 @@
+% workdirs = %w"$(ENCSODIR) $(TRANSSODIR) enc enc/trans"
+% CONFIG["WORKDIRS"] = workdirs.join(' ')
 % CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
 % dldflags = $2
 % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
@@ -143,7 +145,7 @@
 	@$(RM) <%=pathrep[clean]%>
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
-% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir|
+% workdirs.reverse_each do|dir|
 	@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
 % end
 

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

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