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-Original-Commit-Position: refs/heads/master@{#306897}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ea75a9de16c6f45d6ce4a7ce3e1bbf8e0070c0ae
diff --git a/download_build_install.py b/download_build_install.py
index ddaed77..7452043 100755
--- a/download_build_install.py
+++ b/download_build_install.py
@@ -95,7 +95,7 @@
# 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/scripts/udev.sh b/scripts/udev.sh
index 568a5a2..921b590 100755
--- a/scripts/udev.sh
+++ b/scripts/udev.sh
@@ -10,3 +10,6 @@
# 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
