mirror of https://github.com/google/oss-fuzz.git
Fix msan build breakage. (#4787)
Regression from https://github.com/google/oss-fuzz/pull/4694
This commit is contained in:
parent
588336d665
commit
8f4d1b237d
|
@ -91,7 +91,7 @@ def set_up_environment(work_dir):
|
|||
os.mkdir(bin_dir)
|
||||
|
||||
dpkg_host_architecture = wrapper_utils.dpkg_host_architecture()
|
||||
wrapper_utils.CreateSymlinks(
|
||||
wrapper_utils.create_symlinks(
|
||||
compiler_wrapper_path,
|
||||
bin_dir,
|
||||
[
|
||||
|
@ -150,7 +150,8 @@ def set_up_environment(work_dir):
|
|||
msan_log_dir = os.path.join(work_dir, 'msan')
|
||||
os.mkdir(msan_log_dir)
|
||||
msan_log_path = os.path.join(msan_log_dir, 'log')
|
||||
env['MSAN_OPTIONS'] = 'halt_on_error=0:exitcode=0:report_umrs=0:log_path=' + msan_log_path
|
||||
env['MSAN_OPTIONS'] = ('halt_on_error=0:exitcode=0:report_umrs=0:log_path=' +
|
||||
msan_log_path)
|
||||
|
||||
# Increase maximum stack size to prevent tests from failing.
|
||||
limit = 128 * 1024 * 1024
|
||||
|
|
|
@ -31,5 +31,5 @@ class Package(package.Package): # pylint: disable=too-few-public-methods
|
|||
'#!/bin/bash\n'
|
||||
'/usr/bin/dh_auto_configure "$@" --disable-hardware-acceleration')
|
||||
|
||||
wrapper_utils.InstallWrapper(custom_bin_dir, 'dh_auto_configure',
|
||||
configure_wrapper)
|
||||
wrapper_utils.install_wrapper(custom_bin_dir, 'dh_auto_configure',
|
||||
configure_wrapper)
|
||||
|
|
|
@ -30,5 +30,5 @@ class Package(package.Package): # pylint: disable=too-few-public-methods
|
|||
configure_wrapper = ('#!/bin/bash\n'
|
||||
'/usr/bin/dh_auto_configure "$@" --disable-asm')
|
||||
|
||||
wrapper_utils.InstallWrapper(custom_bin_dir, 'dh_auto_configure',
|
||||
configure_wrapper)
|
||||
wrapper_utils.install_wrapper(custom_bin_dir, 'dh_auto_configure',
|
||||
configure_wrapper)
|
||||
|
|
|
@ -35,6 +35,6 @@ class Package(package.Package): # pylint: disable=too-few-public-methods
|
|||
'/usr/bin/nm "$@" | grep -E -v "U (__msan|memset)"\n'
|
||||
'exit ${PIPESTATUS[0]}\n')
|
||||
|
||||
wrapper_utils.InstallWrapper(
|
||||
wrapper_utils.install_wrapper(
|
||||
custom_bin_dir, 'nm', nm_wrapper,
|
||||
[wrapper_utils.dpkg_host_architecture() + '-nm'])
|
||||
|
|
Loading…
Reference in New Issue