--- wxPython/config.py	2008-05-13 17:20:17.000000000 +0300
+++ wxPython/config.py	2008-05-13 17:22:28.000000000 +0300
@@ -751,10 +751,15 @@
 class MyUnixCCompiler(distutils.unixccompiler.UnixCCompiler):
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
+        compiler_cxx_so = self.compiler_cxx_so
         if sys.platform == 'darwin':
             compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
         try:
-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+            if self.language == "c++":
+                cc = compiler_cxx_so + cc_args
+            else:
+                cc = compiler_so + cc_args
+            self.spawn(cc + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg
@@ -799,7 +804,11 @@
             raise CompileError, msg
     else: # for other files use the C-compiler
         try:
-            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+            if self.language == "c++":
+                cc = self.compiler_cxx_so + cc_args
+            else:
+                cc = self.compiler_so + cc_args
+            self.spawn(cc + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg
--- wxPython/wx/build/config.py	2008-05-13 17:22:56.000000000 +0300
+++ wxPython/wx/build/config.py	2008-05-13 17:24:10.000000000 +0300
@@ -751,10 +751,15 @@
 class MyUnixCCompiler(distutils.unixccompiler.UnixCCompiler):
     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
         compiler_so = self.compiler_so
+        compiler_cxx_so = self.compiler_cxx_so
         if sys.platform == 'darwin':
             compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
         try:
-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+            if self.language == "c++":
+                cc = compiler_cxx_so + cc_args
+            else:
+                cc = compiler_so + cc_args
+            self.spawn(cc + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg
@@ -799,7 +804,11 @@
             raise CompileError, msg
     else: # for other files use the C-compiler
         try:
-            self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+            if self.language == "c++":
+                cc = self.compiler_cxx_so + cc_args
+            else:
+                cc = self.compiler_so + cc_args
+            self.spawn(cc + cc_args + [src, '-o', obj] +
                        extra_postargs)
         except DistutilsExecError, msg:
             raise CompileError, msg