this flag was not being propogated to our link rules, so we were not
in fact enforcing no undefined symbols in libraries.
extra_ldflags = TO_LIST(getattr(conf.env, 'LDFLAGS_%s' % lib.upper(), []))
ccflags.extend(extra_ccflags)
ldflags.extend(extra_ldflags)
extra_ldflags = TO_LIST(getattr(conf.env, 'LDFLAGS_%s' % lib.upper(), []))
ccflags.extend(extra_ccflags)
ldflags.extend(extra_ldflags)
+ if 'EXTRA_LDFLAGS' in conf.env:
+ ldflags.extend(conf.env['EXTRA_LDFLAGS'])
+ ccflags = unique_list(ccflags)
+ ldflags = unique_list(ldflags)
return (ccflags, ldflags)
return (ccflags, ldflags)
-def CURRENT_LDFLAGS(bld, target, cflags, hide_symbols=False):
- '''work out the current loader flags. local flags are added first'''
- flags = CURRENT_CFLAGS(bld, target, cflags, hide_symbols=hide_symbols)
- if 'EXTRA_LDFLAGS' in bld.env:
- flags.extend(bld.env['EXTRA_LDFLAGS'])
- return flags
-
-
@conf
def CHECK_CC_ENV(conf):
"""trim whitespaces from 'CC'.
@conf
def CHECK_CC_ENV(conf):
"""trim whitespaces from 'CC'.
# this provides a way to save our dependency calculations between runs
savedeps_version = 3
savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags', 'source', 'grouping_library']
# this provides a way to save our dependency calculations between runs
savedeps_version = 3
savedeps_inputs = ['samba_deps', 'samba_includes', 'local_include', 'local_include_first', 'samba_cflags', 'source', 'grouping_library']
-savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags']
+savedeps_outputs = ['uselib', 'uselib_local', 'add_objects', 'includes', 'ccflags', 'ldflags']
savedeps_outenv = ['INC_PATHS']
savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES']
savedeps_caches = ['GLOBAL_DEPENDENCIES', 'TARGET_ALIAS', 'TARGET_TYPE', 'INIT_FUNCTIONS', 'SYSLIB_DEPS']
savedeps_outenv = ['INC_PATHS']
savedeps_envvars = ['NONSHARED_BINARIES', 'GLOBAL_DEPENDENCIES']
savedeps_caches = ['GLOBAL_DEPENDENCIES', 'TARGET_ALIAS', 'TARGET_TYPE', 'INIT_FUNCTIONS', 'SYSLIB_DEPS']
features = features,
source = [],
target = bundled_name,
features = features,
source = [],
target = bundled_name,
- samba_cflags = CURRENT_LDFLAGS(bld, libname, cflags),
depends_on = depends_on,
samba_deps = deps,
samba_includes = includes,
depends_on = depends_on,
samba_deps = deps,
samba_includes = includes,
features = features,
source = [],
target = binname,
features = features,
source = [],
target = binname,
- samba_cflags = CURRENT_LDFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
samba_deps = deps,
samba_includes = includes,
local_include = local_include,
import os
from samba_utils import SET_TARGET_TYPE
import os
from samba_utils import SET_TARGET_TYPE
-from samba_autoconf import CURRENT_CFLAGS, CURRENT_LDFLAGS
+from samba_autoconf import CURRENT_CFLAGS
def to_list(str):
'''Split a list, preserving quoted strings and existing lists'''
def to_list(str):
'''Split a list, preserving quoted strings and existing lists'''
features = features,
source = [],
target = bundled_name,
features = features,
source = [],
target = bundled_name,
- samba_cflags = CURRENT_LDFLAGS(bld, libname, cflags),
samba_deps = deps,
samba_includes = includes,
vnum = vnum,
samba_deps = deps,
samba_includes = includes,
vnum = vnum,
features = features,
source = [],
target = binname,
features = features,
source = [],
target = binname,
- samba_cflags = CURRENT_LDFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
local_include = True,
samba_deps = deps,
samba_includes = includes,
local_include = True,