From 5aee508df92b982d401ea198800b1400a991612f Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 13 Mar 2019 08:53:56 +0000
Subject: [PATCH] defs-*.mk: Add USE_DISABLE_COMPILER_OPTIMISATION_OPTS

USE_DISABLE_COMPILER_OPTIMISATION_OPTS = true disables options targeted
at disabling optimization features, which were introduced to facilitate
debugging in the first place, but make the commandline harder to compare
to others while troubleshooting the compile process

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-cpp.mk  | 2 +-
 make/defs-dev.mk  | 1 +
 make/defs-dist.mk | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 4f21f4cd..83051894 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -422,7 +422,7 @@ endif
 ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true)
   BUILD_CFLAGS              += -funroll-loops -O3
   BUILD_CPPFLAGS            += -funroll-loops -O3
-else
+else ifeq ($(USE_DISABLE_COMPILER_OPTIMISATION_OPTS),true)
   NO_OPT_FLAGS               = \
     -O0 -g -fno-inline -fno-omit-frame-pointer \
     -fno-optimize-sibling-calls \
diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index c4c63d3b..e7d7edf5 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -283,6 +283,7 @@ COMPILE_DEBUG_CODE          ?= true
 #COMPILE_DEBUG_LOG          ?= true
 USE_COMPILER_DEBUG_OPTS     ?= true
 #USE_COMPILER_OPTIMIZATION_OPTS?= true
+USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= true
 ifeq ($(TARGET),mingw)
 USE_STACK_PROTECTOR         ?= false
 else
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 8c577687..16a0c58b 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -283,6 +283,7 @@ LOG_THREAD_NAMES            ?= true
 #COMPILE_DEBUG_LOG          ?= true
 USE_COMPILER_DEBUG_OPTS     ?= true
 USE_COMPILER_OPTIMIZATION_OPTS?= true
+USE_DISABLE_COMPILER_OPTIMISATION_OPTS ?= false
 USE_STACK_PROTECTOR         ?= true
 #USE_STACK_CHECKER          ?= true