Skip to content

Commit

Permalink
Merge pull request #54 from isuruf/basename
Browse files Browse the repository at this point in the history
Split CC to make sure we get the correct basename of the compiler
  • Loading branch information
jaraco committed Sep 21, 2021
2 parents 04b8822 + c51dc8c commit 02e9f65
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions distutils/tests/test_unixccompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,14 @@ def gcv(v):
sysconfig.get_config_var = gcv
self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')

def gcv(v):
if v == 'CC':
return 'gcc -pthread -B /bar'
elif v == 'GNULD':
return 'yes'
sysconfig.get_config_var = gcv
self.assertEqual(self.cc.rpath_foo(), '-Wl,--enable-new-dtags,-R/foo')

# GCC non-GNULD
sys.platform = 'bar'
def gcv(v):
Expand Down
4 changes: 2 additions & 2 deletions distutils/unixccompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* link shared library handled by 'cc -shared'
"""

import os, sys, re
import os, sys, re, shlex

from distutils import sysconfig
from distutils.dep_util import newer
Expand Down Expand Up @@ -231,7 +231,7 @@ def runtime_library_dir_option(self, dir):
# this time, there's no way to determine this information from
# the configuration data stored in the Python installation, so
# we use this hack.
compiler = os.path.basename(sysconfig.get_config_var("CC"))
compiler = os.path.basename(shlex.split(sysconfig.get_config_var("CC"))[0])
if sys.platform[:6] == "darwin":
from distutils.util import get_macosx_target_ver, split_version
macosx_target_ver = get_macosx_target_ver()
Expand Down

0 comments on commit 02e9f65

Please sign in to comment.