31d41d7b tried to make debug affect tools build only but failed to move
debug_symbols (which appends "-g" to CFLAGS) to tools/Rules.mk. Do that
in this patch.

Signed-off-by: Wei Liu <wei.l...@citrix.com>
---
Cc: Andrew Cooper <andrew.coop...@citrix.com>
Cc: George Dunlap <george.dun...@eu.citrix.com>
Cc: Ian Jackson <ian.jack...@eu.citrix.com>
Cc: Jan Beulich <jbeul...@suse.com>
Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
Cc: Stefano Stabellini <sstabell...@kernel.org>
Cc: Tim Deegan <t...@xen.org>
Cc: Wei Liu <wei.l...@citrix.com>
---
 Config.mk      | 5 -----
 tools/Rules.mk | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Config.mk b/Config.mk
index b26e15c..addf95a 100644
--- a/Config.mk
+++ b/Config.mk
@@ -19,7 +19,6 @@ or       = $(if $(strip $(1)),$(1),$(if $(strip 
$(2)),$(2),$(if $(strip $(3)),$(
 # A debug build of tools?
 # Hypervisor debug build is controlled by Kconfig.
 debug ?= y
-debug_symbols ?= $(debug)
 
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
                          -e s/i86pc/x86_32/ -e s/amd64/x86_64/ \
@@ -211,10 +210,6 @@ define buildmakevars2header-closure
        $(call move-if-changed,$(1).tmp,$(1))
 endef
 
-ifeq ($(debug_symbols),y)
-CFLAGS += -g
-endif
-
 CFLAGS += -fno-strict-aliasing
 
 CFLAGS += -std=gnu99
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 0e73690..0047063 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -26,6 +26,11 @@ CFLAGS_xeninclude = -I$(XEN_INCLUDE)
 
 XENSTORE_XENSTORED ?= y
 
+debug_symbols ?= $(debug)
+ifeq ($(debug_symbols),y)
+CFLAGS += -g
+endif
+
 ifneq ($(nosharedlibs),y)
 INSTALL_SHLIB = $(INSTALL_PROG)
 SYMLINK_SHLIB = ln -sf
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Reply via email to