From 6a4d0f864c3635e81d654e4ee1939e113e8f4cde Mon Sep 17 00:00:00 2001
From: Oliver Chang <ochang@chromium.org>
Date: Mon, 4 Dec 2017 14:48:38 -0800
Subject: [PATCH] msan_builder: Inject MSan flags in wrapper if they don't
 exist.

Some packages build test binaries that don't use DEB_C(XX)FLAGS and fail
during linking.
---
 infra/base-images/msan-builder/compiler_wrapper.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/infra/base-images/msan-builder/compiler_wrapper.py b/infra/base-images/msan-builder/compiler_wrapper.py
index 5f624d582..3e66592b9 100755
--- a/infra/base-images/msan-builder/compiler_wrapper.py
+++ b/infra/base-images/msan-builder/compiler_wrapper.py
@@ -20,6 +20,8 @@ import os
 import subprocess
 import sys
 
+import msan_build
+
 
 def Is32Bit(args):
   """Return whether or not we're 32-bit."""
@@ -72,6 +74,10 @@ def GetCompilerArgs(args):
       '-w',
   ])
 
+  if '-fsanitize=memory' not in args:
+    # If MSan flags weren't added for some reason, add them here.
+    compiler_args.extend(msan_build.INJECTED_ARGS)
+
   return compiler_args