admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #7694 from mistydemeo/fix_nil_sdk_check

Browse Source 
ENV: SDK can be nil
This commit is contained in:
Mike McQuaid 2020-06-05 08:28:04 +01:00 committed by GitHub
commit 4479e0452e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/extend/ENV/std.rb
View File

@ -81,7 +81,7 @@ module Stdenv
prepend "LDFLAGS", "-L#{HOMEBREW_PREFIX}/lib"
sdk = formula ? MacOS.sdk_for_formula(formula, version) : MacOS.sdk(version)
return if !MacOS.sdk_root_needed? && sdk.source != :xcode
return if !MacOS.sdk_root_needed? && sdk&.source != :xcode
sdk = sdk.path

2
Library/Homebrew/extend/os/mac/extend/ENV/super.rb
View File

@ -108,7 +108,7 @@ module Superenv
# @private
def setup_build_environment(formula = nil)
sdk = formula ? MacOS.sdk_for_formula(formula) : MacOS.sdk
if MacOS.sdk_root_needed? || sdk.source == :xcode
if MacOS.sdk_root_needed? || sdk&.source == :xcode
self["HOMEBREW_SDKROOT"] = sdk.path
self["HOMEBREW_DEVELOPER_DIR"] = if sdk.source == :xcode
MacOS::Xcode.prefix