Fix problem with re-raising old exception when CPPDEFINES contains a None or invalid element
Fix problem with re-raising old exception when CPPDEFINES contains a None or invalid element

timj/scons,timj/scons,timj/scons,timj/scons,timj/scons,timj/scons,timj/scons,timj/scons,timj/scons