From 30af80e81c4db1eb00013aefb1789dcc8fa65bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 15 Aug 2018 14:30:32 -0400
Subject: [PATCH] daemon, contrib: build with -O3 in release mode

Change-Id: I1c724c6652e001bc92b36d60e163f29331c6cd74
Reviewed-by: Sebastien Blin <sebastien.blin@savoirfairelinux.com>
---
 configure.ac         | 2 +-
 contrib/src/main.mak | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ad3c4687f8..9d72238c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,7 +639,7 @@ AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug], [Build in debug mode, ad
 
 AS_IF([test "x$enable_debug" = "xyes"],
       [CXXFLAGS="${CXXFLAGS} -g -fno-omit-frame-pointer -Wall -Wextra -Wnon-virtual-dtor -Wno-unknown-pragmas -Wformat=2 -O0"],
-      [CXXFLAGS="${CXXFLAGS} -DNDEBUG=1"])
+      [CXXFLAGS="${CXXFLAGS} -DNDEBUG=1 -O3"])
 
 dnl What Makefiles to generate
 
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 11f9c33052..47256305f2 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -198,9 +198,9 @@ endif
 EXTRA_CXXFLAGS += -std=c++14
 
 ifdef ENABLE_DEBUG
-EXTRA_CFLAGS += -g -fno-omit-frame-pointer
+EXTRA_COMMON += -g -fno-omit-frame-pointer
 else
-EXTRA_CFLAGS += -DNDEBUG=1
+EXTRA_COMMON += -DNDEBUG=1 -O3
 endif
 
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
-- 
GitLab