sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

heimdal_build: Remove bashism from --address-sanitizer build rule

Browse Source 
export FOO=bar is a Bash extension, and is not required in this case, we only need the asn1_compile
to run under the variable, there are no further commands in this sub-shell.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>

Autobuild-User(master): Isaac Boukris <iboukris@samba.org>
Autobuild-Date(master): Sat Jan 18 12:25:16 UTC 2020 on sn-devel-184
This commit is contained in:
Andrew Bartlett
2020-01-18 18:35:42 +10:00
committed by Isaac Boukris
parent 7606800b79
commit cffcc39f18
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/heimdal_build/wscript_build
View File

@ -57,16 +57,16 @@ def HEIMDAL_ASN1(name, source,
# SRC[0].abspath(env) gives the absolute path to the source directory for the first # SRC[0].abspath(env) gives the absolute path to the source directory for the first
# source file. Note that in the case of a option_file, we have more than # source file. Note that in the case of a option_file, we have more than
# one source file # one source file
cd_rule = 'cd "${TGT[0].parent.abspath(env)}"' cd_rule = 'cd "${TGT[0].parent.abspath(env)}" &&'
env = LOAD_ENVIRONMENT() env = LOAD_ENVIRONMENT()
if env.ADDRESS_SANITIZER: if env.ADDRESS_SANITIZER:
# If address sanitizer is enabled, we need to suppress leak checking # If address sanitizer is enabled, we need to suppress leak checking
# in the asn1 tool. # in the asn1 tool.
no_leak_check = " && export ASAN_OPTIONS=detect_leaks=0" no_leak_check = " ASAN_OPTIONS=detect_leaks=0"
else: else:
no_leak_check = "" no_leak_check = ""
asn1_rule = cd_rule + no_leak_check + ' && "${ASN1_COMPILE}" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}' asn1_rule = cd_rule + no_leak_check + ' "${ASN1_COMPILE}" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
source = to_list(source) source = to_list(source)