Dump cross.rb only when verbose [ci skip]

2 files changed, 4 insertions, 3 deletions

diff --git a/common.mk b/common.mk
index 8d9fc08629..f86bf3ff78 100644
--- a/common.mk
+++ b/common.mk
@@ -1333,7 +1333,7 @@ lldb-ruby: $(PROGRAM) PHONY
 DISTPKGS = gzip,zip,all
 PKGSDIR = tmp
 dist:
-	$(BASERUBY) $(tooldir)/make-snapshot \
+	$(BASERUBY) $(V0:1=-v) $(tooldir)/make-snapshot \
 	-srcdir=$(srcdir) -packages=$(DISTPKGS) \
 	-unicode-version=$(UNICODE_VERSION) \
 	$(DISTOPTS) $(PKGSDIR) $(RELNAME)
diff --git a/tool/make-snapshot b/tool/make-snapshot
index b88bcdc297..02b5d182f5 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -22,6 +22,7 @@ $keep_temp ||= nil
 $patch_file ||= nil
 $packages ||= nil
 $digests ||= nil
+$no7z ||= nil
 $tooldir = File.expand_path("..", __FILE__)
 $unicode_version = nil if ($unicode_version ||= nil) == ""
 $colorize = Colorize.new
@@ -146,7 +147,7 @@ unless destdir = ARGV.shift
 end
 revisions = ARGV.empty? ? [nil] : ARGV
 
-if $exported
+if defined?($exported)
   abort "#{File.basename $0}: -exported option is deprecated; use -srcdir instead"
 end
 
@@ -416,7 +417,7 @@ def package(vcs, rev, destdir, tmp = nil)
       f.puts "Object.__send__(:remove_const, :RUBY_VERSION)"
       f.puts "RUBY_VERSION='#{version}'"
     end
-    warn "cross.rb:", File.read("cross.rb").gsub(/^/, "> "), ""
+    puts "cross.rb:", File.read("cross.rb").gsub(/^/, "> "), "" if $VERBOSE
     unless File.exist?("configure")
       print "creating configure..."
       unless system([ENV["AUTOCONF"]]*2)