| SConscript (9555:9222d9e63ddb) | SConscript (9556:463684ff6fd1) |
|---|---|
| 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2005 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 879 unchanged lines hidden (view full) --- 888 secondary_exename = 'm5.' + label 889 890 new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's') 891 new_env.Label = label 892 new_env.Append(**kwargs) 893 894 swig_env = new_env.Clone() 895 swig_env.Append(CCFLAGS='-Werror') | 1# -*- mode:python -*- 2 3# Copyright (c) 2004-2005 The Regents of The University of Michigan 4# All rights reserved. 5# 6# Redistribution and use in source and binary forms, with or without 7# modification, are permitted provided that the following conditions are 8# met: redistributions of source code must retain the above copyright --- 879 unchanged lines hidden (view full) --- 888 secondary_exename = 'm5.' + label 889 890 new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's') 891 new_env.Label = label 892 new_env.Append(**kwargs) 893 894 swig_env = new_env.Clone() 895 swig_env.Append(CCFLAGS='-Werror') |
| 896 897 # Both gcc and clang have issues with unused labels and values in 898 # the SWIG generated code 899 swig_env.Append(CCFLAGS=['-Wno-unused-label', '-Wno-unused-value']) 900 901 # Add additional warnings here that should not be applied to 902 # the SWIG generated code 903 new_env.Append(CXXFLAGS='-Wmissing-declarations') 904 |
|
| 896 if env['GCC']: | 905 if env['GCC']: |
| 897 swig_env.Append(CCFLAGS=['-Wno-uninitialized', '-Wno-sign-compare', 898 '-Wno-parentheses', '-Wno-unused-label', 899 '-Wno-unused-value']) | 906 # Depending on the SWIG version, we also need to supress 907 # warnings about missing field initializers. 908 swig_env.Append(CCFLAGS='-Wno-missing-field-initializers') 909 |
| 900 if compareVersions(env['GCC_VERSION'], '4.6') >= 0: 901 swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable') 902 | 910 if compareVersions(env['GCC_VERSION'], '4.6') >= 0: 911 swig_env.Append(CCFLAGS='-Wno-unused-but-set-variable') 912 |
| 903 # Add additional warnings here that should not be applied to 904 # the SWIG generated code 905 new_env.Append(CXXFLAGS='-Wmissing-declarations') | 913 # If gcc supports it, also warn for deletion of derived 914 # classes with non-virtual desctructors. For gcc >= 4.7 we 915 # also have to disable warnings about the SWIG code having 916 # potentially uninitialized variables. |
| 906 if compareVersions(env['GCC_VERSION'], '4.7') >= 0: 907 new_env.Append(CXXFLAGS='-Wdelete-non-virtual-dtor') | 917 if compareVersions(env['GCC_VERSION'], '4.7') >= 0: 918 new_env.Append(CXXFLAGS='-Wdelete-non-virtual-dtor') |
| 919 swig_env.Append(CCFLAGS='-Wno-maybe-uninitialized') |
|
| 908 if env['CLANG']: | 920 if env['CLANG']: |
| 909 swig_env.Append(CCFLAGS=['-Wno-unused-label', '-Wno-unused-value']) | 921 # Always enable the warning for deletion of derived classes 922 # with non-virtual destructors 923 new_env.Append(CXXFLAGS=['-Wdelete-non-virtual-dtor']) |
| 910 | 924 |
| 911 # Add additional warnings here that should not be applied to 912 # the SWIG generated code 913 new_env.Append(CXXFLAGS=['-Wmissing-declarations', 914 '-Wdelete-non-virtual-dtor']) 915 | |
| 916 werror_env = new_env.Clone() 917 werror_env.Append(CCFLAGS='-Werror') 918 919 def make_obj(source, static, extra_deps = None): 920 '''This function adds the specified source to the correct 921 build environment, and returns the corresponding SCons Object 922 nodes''' 923 --- 165 unchanged lines hidden --- | 925 werror_env = new_env.Clone() 926 werror_env.Append(CCFLAGS='-Werror') 927 928 def make_obj(source, static, extra_deps = None): 929 '''This function adds the specified source to the correct 930 build environment, and returns the corresponding SCons Object 931 nodes''' 932 --- 165 unchanged lines hidden --- |