wscript
changeset 786 78982ea24359
parent 785 bf8e7773836a
child 787 778784e6bd8d
equal deleted inserted replaced
785:bf8e7773836a 786:78982ea24359
    56 
    56 
    57 
    57 
    58 def configure(conf):
    58 def configure(conf):
    59     if not conf.check_tool('compiler_cxx'):
    59     if not conf.check_tool('compiler_cxx'):
    60         Params.fatal("No suitable compiler found")
    60         Params.fatal("No suitable compiler found")
    61 
       
    62 
    61 
    63     # create the second environment, set the variant and set its name
    62     # create the second environment, set the variant and set its name
    64     variant_env = conf.env.copy()
    63     variant_env = conf.env.copy()
    65     variant_name = Params.g_options.debug_level.lower()
    64     variant_name = Params.g_options.debug_level.lower()
    66 
    65 
    77     variant_env.set_variant(variant_name)
    76     variant_env.set_variant(variant_name)
    78     conf.set_env_name(variant_name, variant_env)
    77     conf.set_env_name(variant_name, variant_env)
    79     conf.setenv(variant_name)
    78     conf.setenv(variant_name)
    80 
    79 
    81     variant_env.append_value('CXXDEFINES', 'RUN_SELF_TESTS')
    80     variant_env.append_value('CXXDEFINES', 'RUN_SELF_TESTS')
    82     variant_env.append_value('CXXFLAGS', ['-Wall', '-Werror'])
    81     
       
    82     if os.path.basename(conf.env['CXX']).startswith("g++"):
       
    83         variant_env.append_value('CXXFLAGS', ['-Wall', '-Werror'])
       
    84 
    83     if 'debug' in Params.g_options.debug_level.lower():
    85     if 'debug' in Params.g_options.debug_level.lower():
    84         variant_env.append_value('CXXDEFINES', 'NS3_DEBUG_ENABLE')
    86         variant_env.append_value('CXXDEFINES', 'NS3_DEBUG_ENABLE')
    85         variant_env.append_value('CXXDEFINES', 'NS3_ASSERT_ENABLE')
    87         variant_env.append_value('CXXDEFINES', 'NS3_ASSERT_ENABLE')
    86 
    88 
    87     if sys.platform == 'win32':
    89     if sys.platform == 'win32':
    88         variant_env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")
    90         if os.path.basename(conf.env['CXX']).startswith("g++"):
       
    91             variant_env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")
    89 
    92 
    90     conf.sub_config('src')
    93     conf.sub_config('src')
    91 
    94 
    92 
    95 
    93 def build(bld):
    96 def build(bld):