Attachment #601 for bug #681

View | Details | Raw Unified | Return to bug 681
Collapse All | Expand All

(-)a/src/wscript (-1 / +1 lines)

Lines 87-93	Link Here

    module.module_deps = list(dependencies)

    module.module_deps = list(dependencies)

    if not module.env['ENABLE_STATIC_NS3']:

    if not module.env['ENABLE_STATIC_NS3']:

        module.env.append_value('CXXFLAGS', module.env['shlib_CXXFLAGS'])

        module.env.append_value('CXXFLAGS', module.env['shlib_CXXFLAGS'])

    elif module.env['CXX_NAME'] == 'gcc' and \

    elif module.env['CXX_NAME'] in ['gcc', 'icc'] and \

            os.uname()[4] == 'x86_64' and \

            os.uname()[4] == 'x86_64' and \

            module.env['ENABLE_PYTHON_BINDINGS']:

            module.env['ENABLE_PYTHON_BINDINGS']:

        # enable that flag for static builds only on x86-64 platforms

        # enable that flag for static builds only on x86-64 platforms





    env['PLATFORM'] = sys.platform

    if conf.env['CXX_NAME'] in ['gcc', 'icc']:
        if sys.platform == 'win32':
            env.append_value("LINKFLAGS", "-Wl,--enable-runtime-pseudo-reloc")
        elif sys.platform == 'cygwin':

    env['ENABLE_STATIC_NS3'] = False
    if Options.options.enable_static:
        if env['PLATFORM'].startswith('linux') and \
                env['CXX_NAME'] in ['gcc', 'icc']:
            if re.match('i[3-6]86', os.uname()[4]):
                conf.report_optional_feature("static", "Static build", True, '')
                env['ENABLE_STATIC_NS3'] = True

        lib = bld.new_task_gen('cxx', 'shlib')
        lib.name = 'ns3'
        lib.target = 'ns3'
        if lib.env['CXX_NAME'] in ['gcc', 'icc'] and env['WL_SONAME_SUPPORTED']:
            lib.env.append_value('LINKFLAGS', '-Wl,--soname=%s' % ccroot.get_target_name(lib))
        if sys.platform == 'cygwin':
            lib.features.append('implib') # workaround for WAF bug #472

Return to bug 681