X Tutup
Skip to content

bpo-42235: [macOS] Use LTO/PGO in build-installer.py with new enough compilers #23079

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
ned-deily merged 4 commits into from
May 3, 2021
Merged

bpo-42235: [macOS] Use LTO/PGO in build-installer.py with new enough compilers #23079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
395595a
bpo-42235: [macOS] Use --enable-optimizations in build-installer.py
ronaldoussoren Nov 1, 2020
ab5ba2c
Actually add the changes to build-installer.py
ronaldoussoren Nov 1, 2020
6c21640
Also add --with-lto, that's not implied by "--enable-optimizations"
ronaldoussoren Nov 8, 2020
fec6c65
Update build-installer.py
ronaldoussoren Nov 15, 2020
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
10 changes: 10 additions & 0 deletions Mac/BuildScript/build-installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,14 @@ def library_recipes():

return result

def compilerCanOptimize():
"""
Return True iff the default Xcode version can use PGO and LTO
"""
# bpo-42235: The version check is pretty conservative, can be
# adjusted after testing
mac_ver = tuple(map(int, platform.mac_ver()[0].split('.')))
return mac_ver >= (10, 15)

# Instructions for building packages inside the .mpkg.
def pkg_recipes():
Expand Down Expand Up @@ -1128,6 +1136,7 @@ def buildPython():
"%s "
"%s "
"%s "
"%s "
"LDFLAGS='-g -L%s/libraries/usr/local/lib' "
"CFLAGS='-g -I%s/libraries/usr/local/include' 2>&1"%(
shellQuote(os.path.join(SRCDIR, 'configure')),
Expand All @@ -1140,6 +1149,7 @@ def buildPython():
shellQuote(WORKDIR)[1:-1],))[internalTk()],
(' ', "--with-tcltk-libs='-L%s/libraries/usr/local/lib -ltcl8.6 -ltk8.6'"%(
shellQuote(WORKDIR)[1:-1],))[internalTk()],
(' ', "--enable-optimizations --with-lto")[compilerCanOptimize()],
shellQuote(WORKDIR)[1:-1],
shellQuote(WORKDIR)[1:-1]))

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/macOS/2020-11-01-17-37-16.bpo-42235.A97_BN.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``Mac/BuildScript/build-installer.py`` will now use "--enable-optimizations"
and ``--with-lto`` when building on macOS 10.15 or later.
X Tutup