From 89b1df455fcc78621ef2a77d9b2e8fc5ec35987a Mon Sep 17 00:00:00 2001 From: PaperChalice Date: Wed, 2 Oct 2024 15:31:56 +0800 Subject: [PATCH] use rm_r --- Formula/boost/boost-atomic.rb | 4 ++-- Formula/boost/boost-chrono.rb | 4 ++-- Formula/boost/boost-container.rb | 4 ++-- Formula/boost/boost-context.rb | 4 ++-- Formula/boost/boost-contract.rb | 4 ++-- Formula/boost/boost-date-time.rb | 4 ++-- Formula/boost/boost-exception.rb | 4 ++-- Formula/boost/boost-fiber.rb | 4 ++-- Formula/boost/boost-filesystem.rb | 4 ++-- Formula/boost/boost-graph.rb | 4 ++-- Formula/boost/boost-iostreams.rb | 4 ++-- Formula/boost/boost-json.rb | 4 ++-- Formula/boost/boost-locale.rb | 4 ++-- Formula/boost/boost-log.rb | 4 ++-- Formula/boost/boost-math.rb | 4 ++-- Formula/boost/boost-nowide.rb | 4 ++-- Formula/boost/boost-random.rb | 4 ++-- Formula/boost/boost-regex.rb | 4 ++-- Formula/boost/boost-serialization.rb | 4 ++-- Formula/boost/boost-stacktrace.rb | 4 ++-- Formula/boost/boost-system.rb | 4 ++-- Formula/boost/boost-test.rb | 4 ++-- Formula/boost/boost-thread.rb | 4 ++-- Formula/boost/boost-timer.rb | 4 ++-- Formula/boost/boost-type-erasure.rb | 4 ++-- Formula/boost/boost-wave.rb | 4 ++-- Formula/gcc/arm64-apple-darwin-gcc.rb | 2 +- Formula/gcc/bootstrap-gcc.rb | 2 +- Formula/gcc/g++.rb | 4 ++-- Formula/gcc/gcc-base.rb | 8 ++++---- Formula/gcc/gcc-boot.rb | 2 +- Formula/gcc/gcc-strap.rb | 2 +- Formula/gcc/gfortran.rb | 2 +- Formula/llvm/lldb.rb | 2 +- Formula/llvm/mlir.rb | 4 ++-- cmd/prune-gcc.rb | 6 +++--- cmd/prune-llvm.rb | 6 +++--- 37 files changed, 72 insertions(+), 72 deletions(-) diff --git a/Formula/boost/boost-atomic.rb b/Formula/boost/boost-atomic.rb index c8a181e0..27aa8459 100644 --- a/Formula/boost/boost-atomic.rb +++ b/Formula/boost/boost-atomic.rb @@ -25,8 +25,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-chrono.rb b/Formula/boost/boost-chrono.rb index 4fcc2170..286cedc6 100644 --- a/Formula/boost/boost-chrono.rb +++ b/Formula/boost/boost-chrono.rb @@ -25,8 +25,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-container.rb b/Formula/boost/boost-container.rb index 9db39202..cb23553e 100644 --- a/Formula/boost/boost-container.rb +++ b/Formula/boost/boost-container.rb @@ -25,8 +25,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-context.rb b/Formula/boost/boost-context.rb index 94d5e6a8..1203e8d7 100644 --- a/Formula/boost/boost-context.rb +++ b/Formula/boost/boost-context.rb @@ -26,8 +26,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-contract.rb b/Formula/boost/boost-contract.rb index fcbf703f..7d5ebd12 100644 --- a/Formula/boost/boost-contract.rb +++ b/Formula/boost/boost-contract.rb @@ -27,8 +27,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-date-time.rb b/Formula/boost/boost-date-time.rb index 94e70a01..35f844bc 100644 --- a/Formula/boost/boost-date-time.rb +++ b/Formula/boost/boost-date-time.rb @@ -23,8 +23,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-exception.rb b/Formula/boost/boost-exception.rb index b96d547f..65d6c7df 100644 --- a/Formula/boost/boost-exception.rb +++ b/Formula/boost/boost-exception.rb @@ -24,8 +24,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-fiber.rb b/Formula/boost/boost-fiber.rb index 0edc687f..0fbfe446 100644 --- a/Formula/boost/boost-fiber.rb +++ b/Formula/boost/boost-fiber.rb @@ -24,8 +24,8 @@ def install %w[config context filesystem].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-filesystem.rb b/Formula/boost/boost-filesystem.rb index 26a0898f..ad8aba3e 100644 --- a/Formula/boost/boost-filesystem.rb +++ b/Formula/boost/boost-filesystem.rb @@ -28,8 +28,8 @@ def install %w[config atomic].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-graph.rb b/Formula/boost/boost-graph.rb index 36098d5e..e7901d6c 100644 --- a/Formula/boost/boost-graph.rb +++ b/Formula/boost/boost-graph.rb @@ -23,8 +23,8 @@ def install %w[config regex].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-iostreams.rb b/Formula/boost/boost-iostreams.rb index b821c64e..85d0b4fb 100644 --- a/Formula/boost/boost-iostreams.rb +++ b/Formula/boost/boost-iostreams.rb @@ -31,8 +31,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-json.rb b/Formula/boost/boost-json.rb index 3462e645..ad9085b4 100644 --- a/Formula/boost/boost-json.rb +++ b/Formula/boost/boost-json.rb @@ -24,8 +24,8 @@ def install %w[config container].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-locale.rb b/Formula/boost/boost-locale.rb index 71b18dcb..80594614 100644 --- a/Formula/boost/boost-locale.rb +++ b/Formula/boost/boost-locale.rb @@ -33,8 +33,8 @@ def install %w[atomic config chrono container system thread].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-log.rb b/Formula/boost/boost-log.rb index 2549f464..e36ff2e3 100644 --- a/Formula/boost/boost-log.rb +++ b/Formula/boost/boost-log.rb @@ -29,8 +29,8 @@ def install %w[config atomic chrono filesystem regex thread].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-math.rb b/Formula/boost/boost-math.rb index 8741ff6e..cff79b54 100644 --- a/Formula/boost/boost-math.rb +++ b/Formula/boost/boost-math.rb @@ -25,8 +25,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-nowide.rb b/Formula/boost/boost-nowide.rb index ef699b96..ae1ac577 100644 --- a/Formula/boost/boost-nowide.rb +++ b/Formula/boost/boost-nowide.rb @@ -22,8 +22,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-random.rb b/Formula/boost/boost-random.rb index 1bf8ecc2..dbe89aab 100644 --- a/Formula/boost/boost-random.rb +++ b/Formula/boost/boost-random.rb @@ -21,8 +21,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-regex.rb b/Formula/boost/boost-regex.rb index 3f66687c..facc369b 100644 --- a/Formula/boost/boost-regex.rb +++ b/Formula/boost/boost-regex.rb @@ -24,8 +24,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-serialization.rb b/Formula/boost/boost-serialization.rb index 514f41f3..f6b9255d 100644 --- a/Formula/boost/boost-serialization.rb +++ b/Formula/boost/boost-serialization.rb @@ -21,8 +21,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-stacktrace.rb b/Formula/boost/boost-stacktrace.rb index de68f203..fb0e9b35 100644 --- a/Formula/boost/boost-stacktrace.rb +++ b/Formula/boost/boost-stacktrace.rb @@ -21,8 +21,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-system.rb b/Formula/boost/boost-system.rb index 68ed9319..0dad5f0f 100644 --- a/Formula/boost/boost-system.rb +++ b/Formula/boost/boost-system.rb @@ -23,8 +23,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-test.rb b/Formula/boost/boost-test.rb index 8d13756d..1b9af1ad 100644 --- a/Formula/boost/boost-test.rb +++ b/Formula/boost/boost-test.rb @@ -24,8 +24,8 @@ def install %w[config].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-thread.rb b/Formula/boost/boost-thread.rb index 135ae6cd..8a8be07d 100644 --- a/Formula/boost/boost-thread.rb +++ b/Formula/boost/boost-thread.rb @@ -26,8 +26,8 @@ def install %w[config atomic].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-timer.rb b/Formula/boost/boost-timer.rb index 5fdbe9d2..22699aa1 100644 --- a/Formula/boost/boost-timer.rb +++ b/Formula/boost/boost-timer.rb @@ -25,8 +25,8 @@ def install %w[config chrono].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-type-erasure.rb b/Formula/boost/boost-type-erasure.rb index af532a25..80b26288 100644 --- a/Formula/boost/boost-type-erasure.rb +++ b/Formula/boost/boost-type-erasure.rb @@ -30,8 +30,8 @@ def install %w[atomic config chrono system thread].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/boost/boost-wave.rb b/Formula/boost/boost-wave.rb index 55d35254..3564b5a1 100644 --- a/Formula/boost/boost-wave.rb +++ b/Formula/boost/boost-wave.rb @@ -27,8 +27,8 @@ def install %w[atomic config chrono filesystem thread].each do |d| f = Formula["boost-#{d}"] - f.lib.glob("cmake/*").each { |c| rm_rf "stage/lib/cmake/#{c.basename}" } - f.lib.glob("lib*").each { |l| rm_rf "stage/lib/#{l.basename}" } + f.lib.glob("cmake/*").each { |c| rm_r "stage/lib/cmake/#{c.basename}" } + f.lib.glob("lib*").each { |l| rm_r "stage/lib/#{l.basename}" } end prefix.install "stage/lib" diff --git a/Formula/gcc/arm64-apple-darwin-gcc.rb b/Formula/gcc/arm64-apple-darwin-gcc.rb index 8d21c516..f8b9cf93 100644 --- a/Formula/gcc/arm64-apple-darwin-gcc.rb +++ b/Formula/gcc/arm64-apple-darwin-gcc.rb @@ -85,7 +85,7 @@ def install system "gmake" system "gmake", "install", "-j", "1" end - rm_rf man3/"stdheader.dSYM" + rm_r man3/"stdheader.dSYM" [info, man1, man3, man7].each { |d| Utils::Gzip.compress(*Dir[d/"*"]) } end diff --git a/Formula/gcc/bootstrap-gcc.rb b/Formula/gcc/bootstrap-gcc.rb index 240c8a9e..072933d3 100644 --- a/Formula/gcc/bootstrap-gcc.rb +++ b/Formula/gcc/bootstrap-gcc.rb @@ -109,7 +109,7 @@ def install MachO::Tools.change_dylib_id libstdcxx.to_s, libstdcxx.to_s system "tar", "-cJf", "gcc.tar.xz", "-C", prefix, "." - rm_rf prefix + rm_r prefix prefix.install "gcc.tar.xz" end diff --git a/Formula/gcc/g++.rb b/Formula/gcc/g++.rb index 282e598f..06df7d39 100644 --- a/Formula/gcc/g++.rb +++ b/Formula/gcc/g++.rb @@ -111,9 +111,9 @@ def install rm bin/x bin.install_symlink bin/"#{triple}-g++" => x end - rm_rf lib/"gcc"/triple/version_suffix/"cc1" + rm_r lib/"gcc"/triple/version_suffix/"cc1" end - rm_rf man3/"stdheader.dSYM" + rm_r man3/"stdheader.dSYM" [man1, man3].each { |d| Utils::Gzip.compress(*Dir[d/"*"]) } end diff --git a/Formula/gcc/gcc-base.rb b/Formula/gcc/gcc-base.rb index 1dfcde24..4a048b94 100644 --- a/Formula/gcc/gcc-base.rb +++ b/Formula/gcc/gcc-base.rb @@ -119,18 +119,18 @@ def install %w[cc1 collect2 lto1].each do |t| (lib/"gcc"/triple/version_suffix).install "gcc/#{t}" end - %w[fortran dc ++ m2].each { |m| rm_rf man1/"g#{m}.1" } + %w[fortran dc ++ m2].each { |m| rm_r man1/"g#{m}.1" } %w[fortran nat-style nat_rm nat_ugn dc].each do |i| - rm_rf info/"g#{i}.info" + rm_r info/"g#{i}.info" end - rm_rf lib/"gcc"/triple/version_suffix/"finclude" + rm_r lib/"gcc"/triple/version_suffix/"finclude" end %w[gcc gcc-ar gcc-nm gcc-ranlib].each do |x| rm bin/x bin.install_symlink bin/"#{triple}-#{x}" => x end - rm_rf Dir[lib/"gcc"/triple/version_suffix/"plugin/libcp1plugin.*"] + rm_r Dir[lib/"gcc"/triple/version_suffix/"plugin/libcp1plugin.*"] rm bin/"#{triple}-gcc" bin.install_symlink bin/"#{triple}-gcc-#{version.major}" => "#{triple}-gcc" [man1, man7, info].each { |d| Utils::Gzip.compress(*Dir[d/"*"]) } diff --git a/Formula/gcc/gcc-boot.rb b/Formula/gcc/gcc-boot.rb index a735cb52..1fcad1a5 100644 --- a/Formula/gcc/gcc-boot.rb +++ b/Formula/gcc/gcc-boot.rb @@ -68,7 +68,7 @@ def install system "gmake", "-C", "#{triple}/libstdc++-v3/doc", "prefix=#{prefix}", "doc-install-man" system "gmake", "-C", "#{triple}/libstdc++-v3/po", "prefix=#{prefix}", "install" end - rm_rf man3/"stdheader.dSYM" + rm_r man3/"stdheader.dSYM" [info, man1, man3, man7].each { |d| Utils::Gzip.compress(*Dir[d/"*"]) } MachO::Tools.add_rpath "#{lib}/#{shared_library "libgcc_s", 1}", "@loader_path" MachO::Tools.add_rpath "#{lib}/gcc/#{triple}/#{version.major}/adalib/#{shared_library "libgnarl"}", diff --git a/Formula/gcc/gcc-strap.rb b/Formula/gcc/gcc-strap.rb index 4e6e0a94..c4ed1dea 100644 --- a/Formula/gcc/gcc-strap.rb +++ b/Formula/gcc/gcc-strap.rb @@ -66,7 +66,7 @@ def install system "gmake", "-C", "#{triple}/libstdc++-v3/doc", "prefix=#{prefix}", "doc-install-man" system "gmake", "-C", "#{triple}/libstdc++-v3/po", "prefix=#{prefix}", "install" end - rm_rf man3/"stdheader.dSYM" + rm_r man3/"stdheader.dSYM" [info, man1, man3, man7].each { |d| Utils::Gzip.compress(*Dir[d/"*"]) } gcc_s = (Formula["gcc-boot"].lib/shared_library("libgcc_s", "1.1")).to_s diff --git a/Formula/gcc/gfortran.rb b/Formula/gcc/gfortran.rb index dd89c554..d37c23d7 100644 --- a/Formula/gcc/gfortran.rb +++ b/Formula/gcc/gfortran.rb @@ -91,7 +91,7 @@ def install system "make", "-C", "gcc", "prefix=#{prefix}", "fortran.install-#{t}" end (lib/"gcc"/triple/version_suffix).install "gcc/f951" - rm_rf lib.glob("libquadmath*") + rm_r lib.glob("libquadmath*") end rm bin/"gfortran" diff --git a/Formula/llvm/lldb.rb b/Formula/llvm/lldb.rb index b1f233ef..d90dab46 100644 --- a/Formula/llvm/lldb.rb +++ b/Formula/llvm/lldb.rb @@ -63,7 +63,7 @@ def install clangf = Formula["clang"] (prefix/site_package).install_symlink lldb_framework/"Resources/Python/lldb" %w[darwin-debug lldb-argdumper debugserver].each { |x| bin.install_symlink lldb_framework/"Resources"/x } - rm_rf lldb_framework/"Resources/Clang/include" + rm_r lldb_framework/"Resources/Clang/include" headers = clangf.lib/"clang/#{clangf.version}/include" (lldb_framework/"Resources/Clang").install_symlink headers end diff --git a/Formula/llvm/mlir.rb b/Formula/llvm/mlir.rb index ec39fda8..ddb77a0d 100644 --- a/Formula/llvm/mlir.rb +++ b/Formula/llvm/mlir.rb @@ -36,10 +36,10 @@ def install system "cmake", "--build", "build" system "cmake", "--install", "build" - rm_rf prefix/"src" + rm_r prefix/"src" site_package = Language::Python.site_packages "python3" (prefix/site_package).install prefix/"python_packages/mlir_core/mlir" - rm_rf prefix/"python_packages" + rm_r prefix/"python_packages" end test do diff --git a/cmd/prune-gcc.rb b/cmd/prune-gcc.rb index 8593ec85..49c3785a 100755 --- a/cmd/prune-gcc.rb +++ b/cmd/prune-gcc.rb @@ -10,15 +10,15 @@ def prune_gcc gcc = Formula["gcc"] gcc.prefix.children.each do |f| - rm_rf f unless f.to_s.end_with? "lib" + rm_r f unless f.to_s.end_with? "lib" end (gcc.lib/"gcc").children.each do |f| - rm_rf f unless f.to_s.end_with? "current" + rm_r f unless f.to_s.end_with? "current" end (gcc.lib/"gcc/current").children.each do |f| - rm_rf f unless f.to_s.end_with? ".dylib" + rm_r f unless f.to_s.end_with? ".dylib" end end end diff --git a/cmd/prune-llvm.rb b/cmd/prune-llvm.rb index fd3ec533..8723e023 100755 --- a/cmd/prune-llvm.rb +++ b/cmd/prune-llvm.rb @@ -10,13 +10,13 @@ def prune_llvm llvm = Formula["llvm"] llvm.prefix.children.each do |f| - rm_rf f unless f.to_s.end_with? "lib" + rm_r f unless f.to_s.end_with? "lib" end llvm.lib.children.each do |f| zap = %w[MLIR mlir lldb omp unwind] - rm_rf f unless f.to_s.end_with? "dylib" - rm_rf f if zap.any? { |z| f.to_s.include? z } + rm_r f unless f.to_s.end_with? "dylib" + rm_r f if zap.any? { |z| f.to_s.include? z } end end end