summaryrefslogtreecommitdiffstats
path: root/Doc/distutils
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2009-09-15 19:16:02 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2009-09-15 19:16:02 (GMT)
commitbea37aee6b2de078db2843e94c70a7a9206737f8 (patch)
tree4cebf23657b79786c8233c3bfb352848af1b85a8 /Doc/distutils
parentd097efe99f214894ae4d165db7a24c341936f6bd (diff)
downloadcpython-bea37aee6b2de078db2843e94c70a7a9206737f8.zip
cpython-bea37aee6b2de078db2843e94c70a7a9206737f8.tar.gz
cpython-bea37aee6b2de078db2843e94c70a7a9206737f8.tar.bz2
Merged revisions 74806 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74806 | ronald.oussoren | 2009-09-15 21:13:15 +0200 (Tue, 15 Sep 2009) | 3 lines Finish support for --with-universal-archs=intel and --with-universal-archs=3-way (issue6245) ........
Diffstat (limited to 'Doc/distutils')
-rw-r--r--Doc/distutils/apiref.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index 6438257..af19111 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -1095,7 +1095,10 @@ other utility module.
the univeral binary status instead of the architecture of the current
processor. For 32-bit universal binaries the architecture is ``fat``,
for 64-bit universal binaries the architecture is ``fat64``, and
- for 4-way universal binaries the architecture is ``universal``.
+ for 4-way universal binaries the architecture is ``universal``. Starting
+ from Python 2.7 and Python 3.2 the architecture ``fat3`` is used for
+ a 3-way universal build (ppc, i386, x86_64) and ``intel`` is used for
+ a univeral build with the i386 and x86_64 architectures
Examples of returned values on Mac OS X:
@@ -1105,6 +1108,8 @@ other utility module.
* ``macosx-10.5-universal``
+ * ``macosx-10.6-intel``
+
.. % XXX isn't this also provided by some other non-distutils module?