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

ENV/super: prioritise Xcode if Xcode is a build req

Browse Source
This commit is contained in:
Bo Anderson 2020-04-03 15:34:43 +01:00
parent 93e323ff5d
commit cb6128fc7c
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,47 +44,43 @@ module Superenv
def homebrew_extra_isystem_paths def homebrew_extra_isystem_paths
paths = [] paths = []
paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" } paths << "#{self["HOMEBREW_SDKROOT"]}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt? paths << "#{self["HOMEBREW_SDKROOT"]}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11? paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths << "#{self["HOMEBREW_SDKROOT"]}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers"
paths paths
end end
def homebrew_extra_library_paths def homebrew_extra_library_paths
paths = [] paths = []
if compiler == :llvm_clang if compiler == :llvm_clang
paths << if !MacOS.sdk_path_if_needed paths << "#{self["HOMEBREW_SDKROOT"]}/usr/lib"
"/usr/lib"
else
"#{MacOS.sdk_path}/usr/lib"
end
paths << Formula["llvm"].opt_lib.to_s paths << Formula["llvm"].opt_lib.to_s
end end
paths << MacOS::X11.lib.to_s if x11? paths << MacOS::X11.lib.to_s if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths << "#{self["HOMEBREW_SDKROOT"]}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
paths paths
end end
def homebrew_extra_cmake_include_paths def homebrew_extra_cmake_include_paths
paths = [] paths = []
paths << "#{effective_sysroot}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" } paths << "#{self["HOMEBREW_SDKROOT"]}/usr/include/libxml2" unless deps.any? { |d| d.name == "libxml2" }
paths << "#{effective_sysroot}/usr/include/apache2" if MacOS::Xcode.without_clt? paths << "#{self["HOMEBREW_SDKROOT"]}/usr/include/apache2" if MacOS::Xcode.without_clt?
paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11? paths << MacOS::X11.include.to_s << "#{MacOS::X11.include}/freetype2" if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers" paths << "#{self["HOMEBREW_SDKROOT"]}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers"
paths paths
end end
def homebrew_extra_cmake_library_paths def homebrew_extra_cmake_library_paths
paths = [] paths = []
paths << MacOS::X11.lib.to_s if x11? paths << MacOS::X11.lib.to_s if x11?
paths << "#{effective_sysroot}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" paths << "#{self["HOMEBREW_SDKROOT"]}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries"
paths paths
end end
def homebrew_extra_cmake_frameworks_paths def homebrew_extra_cmake_frameworks_paths
paths = [] paths = []
paths << "#{effective_sysroot}/System/Library/Frameworks" if MacOS::Xcode.without_clt? paths << "#{self["HOMEBREW_SDKROOT"]}/System/Library/Frameworks" if MacOS::Xcode.without_clt?
paths paths
end end
@ -97,23 +93,24 @@ module Superenv
s.freeze s.freeze
end end
def effective_sysroot
MacOS.sdk_path_if_needed&.to_s
end
def set_x11_env_if_installed def set_x11_env_if_installed
ENV.x11 = MacOS::X11.installed? ENV.x11 = MacOS::X11.installed?
end end
# @private # @private
def setup_build_environment(formula = nil) def setup_build_environment(formula = nil)
generic_setup_build_environment(formula) if formula&.requirements&.find { |req| req.is_a? XcodeRequirement }
self["HOMEBREW_SDKROOT"] = effective_sysroot self["HOMEBREW_SDKROOT"] = MacOS.sdk_path_if_needed && MacOS::Xcode.sdk_path
self["HOMEBREW_DEVELOPER_DIR"] = MacOS::Xcode.prefix
else
self["HOMEBREW_SDKROOT"] = MacOS.sdk_path_if_needed&.to_s
self["HOMEBREW_DEVELOPER_DIR"] = if MacOS::CLT.installed? && MacOS::CLT.provides_sdk? self["HOMEBREW_DEVELOPER_DIR"] = if MacOS::CLT.installed? && MacOS::CLT.provides_sdk?
MacOS::CLT::PKG_PATH MacOS::CLT::PKG_PATH
else else
MacOS::Xcode.prefix MacOS::Xcode.prefix
end end
end
generic_setup_build_environment(formula)
# Filter out symbols known not to be defined since GNU Autotools can't # Filter out symbols known not to be defined since GNU Autotools can't
# reliably figure this out with Xcode 8 and above. # reliably figure this out with Xcode 8 and above.