BUG#34373612: Fix the assumption that gcc is the default compiler

nmariz · nmariz · commit 6eb19b9efdca · 2022-07-22T19:12:16.000+01:00
When compiling Connector/Python C extension, it's assumed that gcc and
g++ are the default when logging the compiler information.
This patch fixes it by getting the CC and CXX environment variables.

Thank you for your contribution.

Change-Id: Id440e8f02fc34111372020357bcfa3b69585e72b
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Full release notes:
 v8.0.31
 =======
 
+- BUG#34373612: Fix the assumption that gcc is the default compiler
 - BUG#34283402: Binary data starting with 0x00 are returned as empty string
 - BUG#34217492: Exec of stored procedures with args fails when db prefix used
 - BUG#28491115: Connector/Python crashes on 0 time value
diff --git a/cpydist/__init__.py b/cpydist/__init__.py
@@ -681,13 +681,16 @@ def run(self):
                 ext.extra_compile_args.append("-Wno-unknown-pragmas")
 
         if os.name != "nt":
-            cmd_gcc_ver = ["gcc", "-v"]
-            self.log.info("Executing: {0}".format(" ".join(cmd_gcc_ver)))
-            proc = Popen(cmd_gcc_ver, stdout=PIPE, universal_newlines=True)
+            is_macos = platform.system() == "Darwin"
+            cc = os.environ.get("CC", "clang" if is_macos else "gcc")
+            cxx = os.environ.get("CXX", "clang++" if is_macos else "g++")
+            cmd_cc_ver = [cc, "-v"]
+            self.log.info("Executing: %s", " ".join(cmd_cc_ver))
+            proc = Popen(cmd_cc_ver, stdout=PIPE, universal_newlines=True)
             self.log.info(proc.communicate())
-            cmd_gpp_ver = ["g++", "-v"]
-            self.log.info("Executing: {0}".format(" ".join(cmd_gcc_ver)))
-            proc = Popen(cmd_gpp_ver, stdout=PIPE, universal_newlines=True)
+            cmd_cxx_ver = [cxx, "-v"]
+            self.log.info("Executing: %s", " ".join(cmd_cxx_ver))
+            proc = Popen(cmd_cxx_ver, stdout=PIPE, universal_newlines=True)
             self.log.info(proc.communicate())
 
         # Remove disabled extensions
