diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2020-01-18 18:35:42 +1000 |
|---|---|---|
| committer | Isaac Boukris <iboukris@sn-devel-184> | 2020-01-18 12:25:16 +0000 |
| commit | cffcc39f185031bc85bcf0c770892b115058a831 (patch) | |
| tree | a298453fa6471ed6cd5b5f8cc019486e631f03a1 /source4 | |
| parent | 7606800b798a31d62e69f61d441201e5db2f0d8a (diff) | |
| download | samba-cffcc39f185031bc85bcf0c770892b115058a831.tar.gz | |
heimdal_build: Remove bashism from --address-sanitizer build rule
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
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 7f089677664..e031d9831ff 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -57,16 +57,16 @@ def HEIMDAL_ASN1(name, source, # 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 # one source file - cd_rule = 'cd "${TGT[0].parent.abspath(env)}"' + cd_rule = 'cd "${TGT[0].parent.abspath(env)}" &&' env = LOAD_ENVIRONMENT() if env.ADDRESS_SANITIZER: # If address sanitizer is enabled, we need to suppress leak checking # in the asn1 tool. - no_leak_check = " && export ASAN_OPTIONS=detect_leaks=0" + no_leak_check = " ASAN_OPTIONS=detect_leaks=0" else: 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) |