Merge pull request #10072 from carlocab/big-sur-sdk-path

sdk: use unversioned SDK path on Big Sur
Homebrew · Dec 22, 2020 · b4303c2 · b4303c2
2 parents 962bd8f + 3f0ed01
commit b4303c2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Library/Homebrew/os/mac/sdk.rb b/Library/Homebrew/os/mac/sdk.rb
@@ -91,6 +91,14 @@ def sdk_paths
               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
             {}