BLD,BUG: Fix an extent issue
This commit is contained in:
parent
3b9a56b7bd
commit
69edd1d5db
|
@ -361,6 +361,7 @@ foreach _kop : base_kops
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
foreach mode, details : modes
|
foreach mode, details : modes
|
||||||
|
# Generally, one list is required for each foreach
|
||||||
__cargs = _cargs + _ckop_args
|
__cargs = _cargs + _ckop_args
|
||||||
prec_mode = precision_mappings[mode]
|
prec_mode = precision_mappings[mode]
|
||||||
# Generate the mapping for the type
|
# Generate the mapping for the type
|
||||||
|
@ -376,26 +377,26 @@ foreach _kop : base_kops
|
||||||
endif
|
endif
|
||||||
# Now the rest, one run for each ext, to get the final symbols
|
# Now the rest, one run for each ext, to get the final symbols
|
||||||
foreach ext, extdat : details['exts']
|
foreach ext, extdat : details['exts']
|
||||||
|
_ext_cargs = [] # Will be wiped for each ext preventing redefinitions
|
||||||
extmap = ext_mappings[ext]
|
extmap = ext_mappings[ext]
|
||||||
if extmap.has_key('def')
|
if extmap.has_key('def')
|
||||||
foreach _d : extmap['def']
|
foreach _d : extmap['def']
|
||||||
__cargs += ('-D' + _d)
|
_ext_cargs += ('-D' + _d)
|
||||||
endforeach
|
endforeach
|
||||||
endif
|
endif
|
||||||
if extmap.has_key('undef')
|
if extmap.has_key('undef')
|
||||||
foreach _u : extmap['undef']
|
foreach _u : extmap['undef']
|
||||||
__cargs += ('-U' + _u)
|
_ext_cargs += ('-U' + _u)
|
||||||
endforeach
|
endforeach
|
||||||
endif
|
endif
|
||||||
# Construct the final paths
|
# Construct the final paths
|
||||||
src = join_paths(extdat['dir'], extdat['kernel'])
|
src = join_paths(extdat['dir'], extdat['kernel'])
|
||||||
if extdat.has_key('addl')
|
if extdat.has_key('addl')
|
||||||
__cargs += extdat['addl']
|
_ext_cargs += extdat['addl']
|
||||||
endif
|
endif
|
||||||
sym_name = base.replace('?', mode) + ext
|
sym_name = base.replace('?', mode) + ext
|
||||||
message(sym_name)
|
|
||||||
sym_underscored = f'@sym_name@_'
|
sym_underscored = f'@sym_name@_'
|
||||||
__cargs += [
|
_ext_cargs += [
|
||||||
f'-DASMNAME=@sym_name@',
|
f'-DASMNAME=@sym_name@',
|
||||||
f'-DASMFNAME=@sym_underscored@',
|
f'-DASMFNAME=@sym_underscored@',
|
||||||
f'-DNAME=@sym_underscored@',
|
f'-DNAME=@sym_underscored@',
|
||||||
|
@ -404,11 +405,10 @@ foreach _kop : base_kops
|
||||||
f'-DCHAR_CNAME="@sym_name@"',
|
f'-DCHAR_CNAME="@sym_name@"',
|
||||||
]
|
]
|
||||||
current_def = {
|
current_def = {
|
||||||
'c_args': __cargs,
|
'c_args': __cargs + _ext_cargs,
|
||||||
'name': sym_name,
|
'name': sym_name,
|
||||||
'src': src
|
'src': src
|
||||||
}
|
}
|
||||||
message(__cargs)
|
|
||||||
kernel_confs += current_def
|
kernel_confs += current_def
|
||||||
endforeach
|
endforeach
|
||||||
endforeach
|
endforeach
|
||||||
|
|
Loading…
Reference in New Issue