From 1b6097cfac5ebaeac8ec5d91478812fd4bf70add Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 10 Apr 2017 13:28:45 -0700
Subject: [PATCH] Pass in -fno-exceptions because we dont need them

---
 Makefile   | 2 ++
 build.yaml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index a55e984efd..26a1cc5eee 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ CC_opt = $(DEFAULT_CC)
 CXX_opt = $(DEFAULT_CXX)
 LD_opt = $(DEFAULT_CC)
 LDXX_opt = $(DEFAULT_CXX)
+CXXFLAGS_opt = -fno-exceptions
 CPPFLAGS_opt = -O2
 DEFINES_opt = NDEBUG
 
@@ -109,6 +110,7 @@ CC_dbg = $(DEFAULT_CC)
 CXX_dbg = $(DEFAULT_CXX)
 LD_dbg = $(DEFAULT_CC)
 LDXX_dbg = $(DEFAULT_CXX)
+CXXFLAGS_dbg = -fno-exceptions
 CPPFLAGS_dbg = -O0
 DEFINES_dbg = _DEBUG DEBUG
 
diff --git a/build.yaml b/build.yaml
index f80c259606..e26fa16968 100644
--- a/build.yaml
+++ b/build.yaml
@@ -4326,6 +4326,7 @@ configs:
     DEFINES: NDEBUG
   dbg:
     CPPFLAGS: -O0
+    CXXFLAGS: -fno-exceptions
     DEFINES: _DEBUG DEBUG
   gcov:
     CC: gcc
@@ -4366,6 +4367,7 @@ configs:
     LDFLAGS: -rdynamic
   opt:
     CPPFLAGS: -O2
+    CXXFLAGS: -fno-exceptions
     DEFINES: NDEBUG
   stapprof:
     CPPFLAGS: -O2 -DGRPC_STAP_PROFILER
-- 
GitLab