8000 bpo-32726: macOS installer and framework enhancements and changes for 3.7.0 by ned-deily · Pull Request #5448 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-32726: macOS installer and framework enhancements and changes for 3.7.0 #5448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jan 30, 2018
Merged

bpo-32726: macOS installer and framework enhancements and changes for 3.7.0 #5448

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
be796ce
3.7 macOS installer: add intel-64 option, remove sdk-path
ned-deily Jan 30, 2018
0a40219
Missed an SDKPATH
ned-deily Jan 30, 2018
d9d0bd0
set CC to "gcc" rather than "gcc-4.2"
ned-deily Jan 30, 2018
a512483
really set CC to "gcc" rather than "gcc-4.2"
ned-deily Jan 30, 2018
0db7d78
Do not add "-sysroot /" to compiler flags."
ned-deily Jan 30, 2018
32f7abe
Allow linking with Tcl/Tk versions different from the Current system …
ned-deily Jan 30, 2018
c2ac32e
Build with OpenSSL 1.1.0g
ned-deily Jan 30, 2018
dc7ed8f
Build with SQLite 3.22.0
ned-deily Jan 30, 2018
9d7452f
fix typo
ned-deily Jan 30, 2018
20df93e
Do not create vestigal python.exe link in build
ned-deily Jan 30, 2018
b14cac7
Quick update to the installer Welcome and ReadMe files
ned-deily Jan 30, 2018
db3e4c4
Add NEWS entry
ned-deily Jan 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
really set CC to "gcc" rather than "gcc-4.2"
  • Loading branch information
@ned-deily
ned-deily committed Jan 30, 2018
commit a5124833b15d4fb5b30c671d47260ab640eb4d54
8 changes: 5 additions & 3 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
The SDK stuff was primarily needed for building universal installers
for 10.4; so as of 3.7.0, building installers for 10.4 is no longer
supported with build-installer.
- use generic "gcc" as compiler (CC env var) rather than "gcc-4.2"

TODO:
- support SDKROOT and DEVELOPER_DIR xcrun env variables
- decouple /Library Tcl/Tk versions from /System/Library versions
- test with 10.5 and 10.4 and determine support status

Please ensure that this script keeps working with Python 2.5, to avoid
bootstrap issues (/usr/bin/python is Python 2.5 on OSX 10.5). Doc builds
Expand Down Expand Up @@ -156,10 +158,10 @@ def getDeptargetTuple():
def getTargetCompilers():
target_cc_map = {
'10.4': ('gcc-4.0', 'g++-4.0'),
'10.5': ('gcc-4.2', 'g++-4.2'),
'10.6': ('gcc-4.2', 'g++-4.2'),
'10.5': ('gcc', 'g++'),
'10.6': ('gcc', 'g++'),
}
return target_cc_map.get(DEPTARGET, ('clang', 'clang++') )
return target_cc_map.get(DEPTARGET, ('gcc', 'gcc++') )

CC, CXX = getTargetCompilers()

Expand Down
0