Branch merge

This commit is contained in:
Éric Araujo 2011-05-26 16:35:14 +02:00
commit f46676d48f
8 changed files with 17 additions and 25 deletions

View file

@ -658,11 +658,10 @@ def get_platform():
# to. This makes the compatibility story a bit more sane because the
# machine is going to compile and link as if it were
# MACOSX_DEPLOYMENT_TARGET.
#
cfgvars = get_config_vars()
macver = cfgvars.get('MACOSX_DEPLOYMENT_TARGET')
if 1:
if True:
# Always calculate the release of the running machine,
# needed to determine if we can build fat binaries or not.
@ -757,7 +756,7 @@ def _main():
print('Platform: "%s"' % get_platform())
print('Python version: "%s"' % get_python_version())
print('Current installation scheme: "%s"' % _get_default_scheme())
print('')
print()
_print_dict('Paths', get_paths())
print()
_print_dict('Variables', get_config_vars())