From 9ad37ddc36c8438db97fdb3e4484d724e06eaffe Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 9 Nov 2020 16:26:09 +0000 Subject: [PATCH] Revert "uses_from_macos: fix force_homebrew_on_linux behaviour." --- Library/Homebrew/extend/os/mac/software_spec.rb | 2 -- Library/Homebrew/extend/os/software_spec.rb | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/software_spec.rb b/Library/Homebrew/extend/os/mac/software_spec.rb index c15aa85ee7..221c0c4ca6 100644 --- a/Library/Homebrew/extend/os/mac/software_spec.rb +++ b/Library/Homebrew/extend/os/mac/software_spec.rb @@ -1,8 +1,6 @@ # typed: false # frozen_string_literal: true -# The Library/Homebrew/extend/os/software_spec.rb conditional logic will need to be more nuanced -# if this file ever includes more than `uses_from_macos`. class SoftwareSpec undef uses_from_macos diff --git a/Library/Homebrew/extend/os/software_spec.rb b/Library/Homebrew/extend/os/software_spec.rb index 9f130f7150..15da2d0e5a 100644 --- a/Library/Homebrew/extend/os/software_spec.rb +++ b/Library/Homebrew/extend/os/software_spec.rb @@ -1,9 +1,8 @@ # typed: strict # frozen_string_literal: true -# This logic will need to be more nuanced if this file includes more than `uses_from_macos`. -if OS.mac? || Homebrew::EnvConfig.force_homebrew_on_linux? - require "extend/os/mac/software_spec" -elsif OS.linux? +if OS.linux? require "extend/os/linux/software_spec" +elsif OS.mac? + require "extend/os/mac/software_spec" end