diff options
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 4761ea0..e2883f4 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -54,7 +54,6 @@ import SCons.Node.Python import SCons.Platform import SCons.SConsign import SCons.Sig -import SCons.Sig.MD5 import SCons.Sig.TimeStamp import SCons.Subst import SCons.Tool @@ -513,6 +512,7 @@ class SubstitutionEnvironment: """ dict = { 'ASFLAGS' : [], + 'CFLAGS' : [], 'CCFLAGS' : [], 'CPPDEFINES' : [], 'CPPFLAGS' : [], @@ -641,6 +641,8 @@ class SubstitutionEnvironment: elif arg == '-pthread': dict['CCFLAGS'].append(arg) dict['LINKFLAGS'].append(arg) + elif arg[:5] == '-std=': + dict['CFLAGS'].append(arg) # C only elif arg[0] == '+': dict['CCFLAGS'].append(arg) dict['LINKFLAGS'].append(arg) @@ -1667,8 +1669,15 @@ class Base(SubstitutionEnvironment): def SourceSignatures(self, type): type = self.subst(type) if type == 'MD5': - import SCons.Sig.MD5 - self._calc_module = SCons.Sig.MD5 + try: + import SCons.Sig.MD5 + except ImportError: + msg = "No MD5 module available, using time stamps" + SCons.Warnings.warn(SCons.Warnings.NoMD5ModuleWarning, msg) + import SCons.Sig.TimeStamp + self._calc_module = SCons.Sig.TimeStamp + else: + self._calc_module = SCons.Sig.MD5 elif type == 'timestamp': import SCons.Sig.TimeStamp self._calc_module = SCons.Sig.TimeStamp |