[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-dev
Subject:    [Gpsd-dev] [PATCH] Fix building without the scan-build wrapper.
From:       Beat Bolli <bbolli () ewanet ! ch>
Date:       2011-04-22 17:04:19
Message-ID: 1303491859-25043-1-git-send-email-bbolli () ewanet ! ch
[Download RAW message or body]

---
 SConstruct |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SConstruct b/SConstruct
index eb644ce..0d860f9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -746,11 +746,11 @@ for i in range(len(vars)):
 (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy) = vars
 # in case CC/CXX was set to the scan-build wrapper,
 # ensure that we build the python modules with scan-build, too
-if env['CC'].find('scan-build') < 0:
+if env['CC'] is None or env['CC'].find('scan-build') < 0:
     python_env['CC'] = cc
 else:
     python_env['CC'] = ' '.join([env['CC']] + cc.split()[1:])
-if env['CXX'].find('scan-build') < 0:
+if env['CXX'] is None or env['CXX'].find('scan-build') < 0:
     python_env['CXX'] = cxx
 else:
     python_env['CXX'] = ' '.join([env['CXX']] + cxx.split()[1:])
-- 
1.7.4.1
_______________________________________________
Gpsd-dev mailing list
Gpsd-dev@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/gpsd-dev
[prev in list] [next in list] [prev in thread] [next in thread]