Revert "tools: detect appropriate debug optimization level"

This reverts commit b43501451733193b265de30fd79a764363a2a473.

Due to the implementation of cc-option, the check is always true,
which means build for gcc that doesn't have -Og support is broken.

This patch can be reapplied once we have fixed cc-option.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/Rules.mk b/tools/Rules.mk
index 3848bcf1f7bf4840c1a5a898572c9c6e84ed9ec7..296b722372f37ae7c00940ec244570f5f31fb83a 100644 (file)
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -164,13 +164,8 @@ LDLIBS_libxenvchan = $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(libexten
 SHLIB_libxenvchan  = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN)
 
 ifeq ($(debug),y)
-CFLAGS += -fno-omit-frame-pointer
-# Use optimizations compatible with debugging otherwise disable optimizations
-ifneq ($(call cc-option,$(CC),-Og,n),n)
-CFLAGS += -Og
-else
-CFLAGS += -O0
-endif
+# Disable optimizations
+CFLAGS += -O0 -fno-omit-frame-pointer
 # But allow an override to -O0 in case Python enforces -D_FORTIFY_SOURCE=<n>.
 PY_CFLAGS += $(PY_NOOPT_CFLAGS)
 else