diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-21 03:45:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-21 03:45:21 +0000 |
| commit | 12329a58e17a837072e20a64bf3ec6a84e38cc8f (patch) | |
| tree | ef48d792ca023d86d5fdb19d87b875cd5d887048 | |
| parent | 379f68fe4fa656bb717eee23e9415cfb6660744b (diff) | |
* configure.in (target_archs): remove temporary objects.
* enc/Makefile.in, enc/depend (clean): remove work directories.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | enc/Makefile.in | 2 | ||||
| -rw-r--r-- | enc/depend | 4 |
4 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Dec 21 12:45:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@fsij.org> * pack.c: parenthesize macro arguments. diff --git a/configure.in b/configure.in index 63a88bc3f7..3a1999c78c 100644 --- a/configure.in +++ b/configure.in @@ -194,8 +194,8 @@ if test ${target_archs+set}; then 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 diff --git a/enc/Makefile.in b/enc/Makefile.in index a37541d000..0894b26fb2 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -51,7 +51,7 @@ archflag = @ARCH_FLAG@ DLDFLAGS = $(ldflags) $(dldflags) $(archflag) RUBY = $(MINIRUBY) -WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans +WORKDIRS = @WORKDIRS@ RM = @RM@ RMDIR = @RMDIR@ diff --git a/enc/depend b/enc/depend index 23f7bd2922..e331d5b595 100644 --- a/enc/depend +++ b/enc/depend @@ -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 @@ clean: @$(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 |