mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-08 11:33:49 -05:00
Prefer ZLib from Homebrew/MacPorts if present
Zlib from XCode is virtually always present now so it only makes sense to use it from elsewhere if it's preferred. Works around build failure for 2.7 that's incapable of using Zlib from XCode 7+ (see #3301)
This commit is contained in:
@@ -863,7 +863,7 @@ build_package_standard_build() {
|
|||||||
use_homebrew_readline || true
|
use_homebrew_readline || true
|
||||||
use_homebrew_ncurses || true
|
use_homebrew_ncurses || true
|
||||||
if is_mac -ge 1014; then
|
if is_mac -ge 1014; then
|
||||||
use_xcode_sdk_zlib || use_homebrew_zlib || true
|
use_homebrew_zlib || use_xcode_sdk_zlib || true
|
||||||
else
|
else
|
||||||
use_homebrew_zlib || true
|
use_homebrew_zlib || true
|
||||||
fi
|
fi
|
||||||
@@ -873,7 +873,7 @@ build_package_standard_build() {
|
|||||||
use_macports_readline || true
|
use_macports_readline || true
|
||||||
use_macports_ncurses || true
|
use_macports_ncurses || true
|
||||||
if is_mac -ge 1014; then
|
if is_mac -ge 1014; then
|
||||||
use_xcode_sdk_zlib || use_macports_zlib || true
|
use_macports_zlib || use_xcode_sdk_zlib || true
|
||||||
else
|
else
|
||||||
use_macports_zlib || true
|
use_macports_zlib || true
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user