diff options
| author | earthdok <earthdok@chromium.org> | 2014-12-04 13:40:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 21:40:28 +0000 |
| commit | ea75a9de16c6f45d6ce4a7ce3e1bbf8e0070c0ae (patch) | |
| tree | 3d936123b61cff30cc61dd0b7a2793e82490bd63 /third_party/instrumented_libraries | |
| parent | f1c87bfafb8fb5822cbc740e4373715773f1954f (diff) | |
| download | chromium_src-ea75a9de16c6f45d6ce4a7ce3e1bbf8e0070c0ae.zip chromium_src-ea75a9de16c6f45d6ce4a7ce3e1bbf8e0070c0ae.tar.gz chromium_src-ea75a9de16c6f45d6ce4a7ce3e1bbf8e0070c0ae.tar.bz2 | |
Instrumented libraries: do not use FORTIFY_SOURCE when building udev.
Also, address a nit from a prior post-commit review.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/755653006
Cr-Commit-Position: refs/heads/master@{#306897}
Diffstat (limited to 'third_party/instrumented_libraries')
| -rwxr-xr-x | third_party/instrumented_libraries/download_build_install.py | 2 | ||||
| -rwxr-xr-x | third_party/instrumented_libraries/scripts/udev.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py index ddaed77..7452043 100755 --- a/third_party/instrumented_libraries/download_build_install.py +++ b/third_party/instrumented_libraries/download_build_install.py @@ -95,7 +95,7 @@ def destdir_configure_make_install(parsed_arguments, environment, # Installing to a temporary directory allows us to safely clean up the .la # files below. destdir = '%s/debian/instrumented_build' % os.getcwd() - # Some makefiles use BUILDROOT instead of DESTDIR. + # Some makefiles use BUILDROOT or INSTALL_ROOT instead of DESTDIR. make_command = 'make DESTDIR=%s BUILDROOT=%s INSTALL_ROOT=%s' % (destdir, destdir, destdir) diff --git a/third_party/instrumented_libraries/scripts/udev.sh b/third_party/instrumented_libraries/scripts/udev.sh index 568a5a2..921b590 100755 --- a/third_party/instrumented_libraries/scripts/udev.sh +++ b/third_party/instrumented_libraries/scripts/udev.sh @@ -10,3 +10,6 @@ autoreconf --force # Do not warn about undefined sanitizer symbols in object files. sed -i "s/\(-Wl,--no-undefined\|-Wl,-z,defs\)//g" ./configure + +# Do not fortify source (doesn't work with MSan). +sed -i "s/-D_FORTIFY_SOURCE=2/-U_FORTIFY_SOURCE/g" ./configure |