From f9c14a42e8582a66abd2b1577e3f3ab6f4e90888 Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Fri, 27 Feb 2015 09:31:29 -0800
Subject: [PATCH] Fix compile on Mac

---
 Makefile                          | 2 +-
 build_tools/build_detect_platform | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 98e64be94..9b2467034 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ CFLAGS += ${EXTRA_CFLAGS}
 CXXFLAGS += ${EXTRA_CXXFLAGS}
 LDFLAGS += $(EXTRA_LDFLAGS)
 MACHINE ?= $(shell uname -m)
-ARFLAGS = rsD
+ARFLAGS = rs
 
 ifneq ($(MAKECMDGOALS),dbg)
 OPT += -O2 -fno-omit-frame-pointer
diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform
index 002c6f1e8..3062759dd 100755
--- a/build_tools/build_detect_platform
+++ b/build_tools/build_detect_platform
@@ -84,7 +84,7 @@ if test -z "$CLANG_SCAN_BUILD"; then
 fi
 
 if test -z "$CLANG_ANALYZER"; then
-    CLANG_ANALYZER=$(which clang++)
+    CLANG_ANALYZER=$(which clang++ 2> /dev/null)
 fi
 
 COMMON_FLAGS="$COMMON_FLAGS ${CFLAGS}"