From b2c382d1d3ba02d64e0934785f45bb997039cef5 Mon Sep 17 00:00:00 2001
From: Mike Aizatsky <mike.aizatsky@gmail.com>
Date: Wed, 8 Feb 2017 13:47:40 -0800
Subject: [PATCH] [boringssl] disabling asm when building with msan.

@kcc @davidben

Followup to ef490bc1471c35cff5bbdd0051601ecc2899ca43
---
 projects/boringssl/build.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/projects/boringssl/build.sh b/projects/boringssl/build.sh
index 4c0a1aba6..a67751f09 100755
--- a/projects/boringssl/build.sh
+++ b/projects/boringssl/build.sh
@@ -21,11 +21,18 @@ cd $WORK/boringssl
 CFLAGS="$CFLAGS -DBORINGSSL_UNSAFE_FUZZER_MODE"
 CXXFLAGS="$CXXFLAGS -DBORINGSSL_UNSAFE_FUZZER_MODE"
 
+CMAKE_DEFINES=""
+if [[ $SANITIZER_FLAGS = *sanitize=memory* ]]
+then
+  CMAKE_DEFINES="-DOPENSSL_NO_ASM=1"
+fi
+
 cmake -GNinja -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX \
-    -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-    $SRC/boringssl/
+      -DCMAKE_C_FLAGS="$CFLAGS" -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+      $CMAKE_DEFINES $SRC/boringssl/
 ninja
 
+
 fuzzerFiles=$(find $SRC/boringssl/fuzz/ -name "*.cc")
 
 find . -name "*.a"