Address Savannah bug #44648: GPSD won't build...

...if CCFLAGS contains options that are only compatible with the cross-compiler

1 files changed, 13 insertions, 0 deletions

diff --git a/SConstruct b/SConstruct
index c47924d1..b6a79bc3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1094,10 +1094,23 @@ else:
     # ensure that we build the python modules with scan-build, too
     if env['CC'] is None or env['CC'].find('scan-build') < 0:
         python_env['CC'] = cc
+        # As we seem to be changing compilers we must assume that the
+        # CCFLAGS are incompatible with the new compiler. If we should
+        # use other flags, the variable or the variable for this
+        # should be predefined.
+        if cc.split()[0] != env['CC']:
+            python_env['CCFLAGS'] = ''
     else:
         python_env['CC'] = ' '.join([env['CC']] + cc.split()[1:])
     if env['CXX'] is None or env['CXX'].find('scan-build') < 0:
         python_env['CXX'] = cxx
+        # As we seem to be changing compilers we must assume that the
+        # CCFLAGS or CXXFLAGS are incompatible with the new
+        # compiler. If we should use other flags, the variable or the
+        # variable for this should be predefined.
+        if cxx.split()[0] != env['CXX']:
+            python_env['CCFLAGS'] = '' 
+            python_env['CXXFLAGS'] = ''
     else:
         python_env['CXX'] = ' '.join([env['CXX']] + cxx.split()[1:])