From f6bfb8d75744e28f703311b594a0d7ae4384e4b7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 5 Oct 2023 17:08:55 +0100 Subject: [PATCH] Revert "Revert "standalone/bootsnap: relax restrictions"" --- Library/Homebrew/startup/bootsnap.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Library/Homebrew/startup/bootsnap.rb b/Library/Homebrew/startup/bootsnap.rb index 7cf031949a..30064f196e 100644 --- a/Library/Homebrew/startup/bootsnap.rb +++ b/Library/Homebrew/startup/bootsnap.rb @@ -5,15 +5,9 @@ # rubocop:disable Rails homebrew_bootsnap_enabled = ENV["HOMEBREW_NO_BOOTSNAP"].nil? && !ENV["HOMEBREW_BOOTSNAP"].nil? -# portable ruby doesn't play nice with bootsnap - -homebrew_bootsnap_enabled &&= !RUBY_PATH.to_s.include?("/vendor/portable-ruby/") - +# we need some development tools to build bootsnap native code homebrew_bootsnap_enabled &&= if ENV["HOMEBREW_MACOS_VERSION"] - # Apple Silicon doesn't play nice with bootsnap - ENV["HOMEBREW_PROCESSOR"] == "Intel" && - # we need some development tools to build bootsnap native code - (File.directory?("/Applications/Xcode.app") || File.directory?("/Library/Developer/CommandLineTools")) + File.directory?("/Applications/Xcode.app") || File.directory?("/Library/Developer/CommandLineTools") else File.executable?("/usr/bin/clang") || File.executable?("/usr/bin/gcc") end