Skip to content

Commit

Permalink
Handle 2.6.5 OS X framework builds which used --universal-archs=intel…
Browse files Browse the repository at this point in the history
… as it results in 32- and 64-bit binaries.
  • Loading branch information
brosner committed Mar 25, 2010
1 parent 3c26894 commit c6945fb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions virtualenv.py
Expand Up @@ -736,7 +736,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear):
mkdir(bin_dir)
py_executable = join(bin_dir, os.path.basename(sys.executable))
if 'Python.framework' in prefix:
if py_executable.endswith('/Python'):
if re.search(r'/Python(?:-32|-64)*$', py_executable):
# The name of the python executable is not quite what
# we want, rename it.
py_executable = os.path.join(
Expand Down Expand Up @@ -784,7 +784,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear):
# browse_thread/thread/17cab2f85da75951
shutil.copy(
os.path.join(
prefix, 'Resources/Python.app/Contents/MacOS/Python'),
prefix, 'Resources/Python.app/Contents/MacOS/%s' % os.path.basename(sys.executable)),
py_executable)

# Copy the framework's dylib into the virtual
Expand Down

0 comments on commit c6945fb

Please sign in to comment.