kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in (target_archs): remove temporary objects.

Browse source 
* 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
This commit is contained in:
nobu 2010-12-21 03:45:21 +00:00
parent 379f68fe4f
commit 12329a58e1
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Tue Dec 21 07:39:12 2010 Tanaka Akira <akr@fsij.org>
* pack.c: parenthesize macro arguments. * pack.c: parenthesize macro arguments.

4
configure.in
View file

@ -194,8 +194,8 @@ if test ${target_archs+set}; then
else else
if test x"$target_cpu" != x"${target_archs}"; then if test x"$target_cpu" != x"${target_archs}"; then
echo 'int main(){return 0;}' > conftest.c echo 'int main(){return 0;}' > conftest.c
if $CC $CFLAGS $ARCH_FLAG conftest.c > /dev/null 2>&1; then if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
rm -f conftest.* a.out rm -fr conftest.*
else else
RUBY_DEFAULT_ARCH("$target_archs") RUBY_DEFAULT_ARCH("$target_archs")
fi fi

2
enc/Makefile.in
View file

@ -51,7 +51,7 @@ archflag = @ARCH_FLAG@
DLDFLAGS = $(ldflags) $(dldflags) $(archflag) DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
RUBY = $(MINIRUBY) RUBY = $(MINIRUBY)
WORKDIRS = $(ENCSODIR) $(TRANSSODIR) enc enc/trans WORKDIRS = @WORKDIRS@
RM = @RM@ RM = @RM@
RMDIR = @RMDIR@ RMDIR = @RMDIR@

4
enc/depend
View file

@ -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') % CONFIG["DLDFLAGS"].sub!(/(\A|\s)(-\S+(?:\s*\w*)?\$\(TARGET\)\S*)/, '\1')
% dldflags = $2 % dldflags = $2
% enable_shared = CONFIG['ENABLE_SHARED'] == 'yes' % enable_shared = CONFIG['ENABLE_SHARED'] == 'yes'
@ -143,7 +145,7 @@ clean:
@$(RM) <%=pathrep[clean]%> @$(RM) <%=pathrep[clean]%>
% end % end
% @ignore_error = $nmake ? '' : ' 2> /dev/null || true' % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
% %w[$(TRANSSODIR) $(ENCSODIR)].each do|dir| % workdirs.reverse_each do|dir|
@-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> @-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
% end % end