Commit 7ae61fac authored by Neal Norwitz's avatar Neal Norwitz

Fix SF # 532618 517704, install problems when building modules fail.

Fix whitespace on a line also.
parent e87b0c22
...@@ -188,8 +188,13 @@ class PyBuildExt(build_ext): ...@@ -188,8 +188,13 @@ class PyBuildExt(build_ext):
# distutils.command.build_ext.build_extension(). The # distutils.command.build_ext.build_extension(). The
# _built_objects attribute is stored there strictly for # _built_objects attribute is stored there strictly for
# use here. # use here.
for filename in self._built_objects: # If there is a failure, _built_objects may not be there,
os.remove(filename) # so catch the AttributeError and move on.
try:
for filename in self._built_objects:
os.remove(filename)
except AttributeError:
self.announce('unable to remove files (ignored)')
else: else:
self.announce('*** WARNING: importing extension "%s" ' self.announce('*** WARNING: importing extension "%s" '
'failed: %s' % (ext.name, why)) 'failed: %s' % (ext.name, why))
...@@ -605,7 +610,7 @@ class PyBuildExt(build_ext): ...@@ -605,7 +610,7 @@ class PyBuildExt(build_ext):
# procedure triggers on. # procedure triggers on.
frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR') frameworkdir = sysconfig.get_config_var('PYTHONFRAMEWORKDIR')
exts.append( Extension('gestalt', ['gestaltmodule.c'], exts.append( Extension('gestalt', ['gestaltmodule.c'],
extra_link_args=['-framework', 'Carbon']) ) extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('MacOS', ['macosmodule.c'], exts.append( Extension('MacOS', ['macosmodule.c'],
extra_link_args=['-framework', 'Carbon']) ) extra_link_args=['-framework', 'Carbon']) )
exts.append( Extension('icglue', ['icgluemodule.c'], exts.append( Extension('icglue', ['icgluemodule.c'],
......
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