Commit d4314dcf authored by Ned Deily's avatar Ned Deily

Issue #23032: Fix installer build failures on OS X 10.4 Tiger

by disabling assembly code in the OpenSSL build.
parent c6f5a7b9
......@@ -844,6 +844,11 @@ def build_universal_openssl(basedir, archList):
separately then lipo them together into fat libraries.
"""
# OpenSSL fails to build with Xcode 2.5 (on OS X 10.4).
# If we are building on a 10.4.x or earlier system,
# unilaterally disable assembly code building to avoid the problem.
no_asm = int(platform.release().split(".")[0]) < 9
def build_openssl_arch(archbase, arch):
"Build one architecture of openssl"
arch_opts = {
......@@ -868,6 +873,8 @@ def build_universal_openssl(basedir, archList):
"--prefix=%s"%os.path.join("/", *FW_VERSION_PREFIX),
"--openssldir=/System/Library/OpenSSL",
]
if no_asm:
configure_opts.append("no-asm")
runCommand(" ".join(["perl", "Configure"]
+ arch_opts[arch] + configure_opts))
runCommand("make depend OSX_SDK=%s" % SDKPATH)
......
......@@ -57,6 +57,12 @@ IDLE
- Issue #16893: Update Idle doc chapter to match current Idle and add new
information.
Build
-----
- Issue #23032: Fix installer build failures on OS X 10.4 Tiger
by disabling assembly code in the OpenSSL build.
What's New in Python 2.7.9?
===========================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment