From: Thomas Wouters <thomas@python.org>
Date: Mon, 16 Jul 2001 16:00:32 +0000 (+0000)
Subject: Backport AMK's checkin 1.42:
X-Git-Tag: v2.1.1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=98cc791f6c8cb43a52fa4959de1d262ffbe9c69d;p=thirdparty%2FPython%2Fcpython.git

Backport AMK's checkin 1.42:

Fix bug #437487: "2.1 build on Solaris fails if CC is set"
by adding the contents of CCSHARED to the compiler specified by CC
---

diff --git a/setup.py b/setup.py
index 5fc981cb0c2d..04111a1d992a 100644
--- a/setup.py
+++ b/setup.py
@@ -118,7 +118,8 @@ class PyBuildExt(build_ext):
         # unfortunately, distutils doesn't let us provide separate C and C++
         # compilers
         if compiler is not None:
-            args['compiler_so'] = compiler
+            (ccshared,) = sysconfig.get_config_vars('CCSHARED')
+            args['compiler_so'] = compiler + ' ' + ccshared
         if linker_so is not None:
             args['linker_so'] = linker_so + ' -shared'
         self.compiler.set_executables(**args)