From 3f0ed01a2aeceb9fbe8ff410a170d7f30b7936e4 Mon Sep 17 00:00:00 2001
From: carlocab <30379873+carlocab@users.noreply.github.com>
Date: Sun, 20 Dec 2020 14:02:48 +0000
Subject: [PATCH] sdk: use unversioned SDK path on Big Sur

Fixes https://github.com/Homebrew/homebrew-core/issues/67075.

This implements @fxcoudert's suggestion in the issue linked above.
---
 Library/Homebrew/os/mac/sdk.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb
index 5fc79d6268..c7f3ef37ff 100644
--- a/Library/Homebrew/os/mac/sdk.rb
+++ b/Library/Homebrew/os/mac/sdk.rb
@@ -91,6 +91,14 @@ module OS
               paths[OS::Mac::Version.new(version)] = sdk_path if version.present?
             end
 
+            # Use unversioned SDK path on Big Sur to avoid issues such as:
+            # https://github.com/Homebrew/homebrew-core/issues/67075
+            if OS::Mac.version >= :big_sur
+              sdk_path = File.join(sdk_prefix, "MacOSX.sdk")
+              version = OS::Mac.full_version
+              paths[version] = sdk_path if File.directory?(sdk_path)
+            end
+
             paths
           else
             {}