[PATCH] build: don't shadow debug with "@debug@" in tools build

[PATCH] build: don't shadow debug with "@debug@" in tools build

[Wei Liu]

In 16181cbb (tools: Honor Config.mk debug value, rather than setting our
own), configure doesn't set debug variable anymore. There is, however,
one place that was missed. The file config/Tools.mk.in was still
expecting a @debug@ value from configure. After 16181cbb that value
remained "debug := @debug@" all the time because configure didn't
substitute it.

The consequence was that we couldn't get a debug build even if debug was
set to "y" in Config.mk.

Fix this by removing the stray line "debug := @debug@" in Tools.mk.in.

Reported-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Cc: Fabio Fantoni <fabio.fantoni@m2r.biz>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>

Backport candidate for 4.6.
---
 config/Tools.mk.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 9bd5f6c..ccfe137 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -5,9 +5,6 @@ ifeq ($(CONFIG_RUMP),y)
 XEN_OS              := NetBSDRump
 endif
 
-# A debug build of tools?
-debug               := @debug@
-
 # Tools path
 BISON               := @BISON@
 FLEX                := @FLEX@
-- 
2.1.4

Re: [PATCH] build: don't shadow debug with "@debug@" in tools build

[Fabio Fantoni]

Il 11/10/2015 16:41, Wei Liu ha scritto:
> In 16181cbb (tools: Honor Config.mk debug value, rather than setting our
> own), configure doesn't set debug variable anymore. There is, however,
> one place that was missed. The file config/Tools.mk.in was still
> expecting a @debug@ value from configure. After 16181cbb that value
> remained "debug := @debug@" all the time because configure didn't
> substitute it.
>
> The consequence was that we couldn't get a debug build even if debug was
> set to "y" in Config.mk.
>
> Fix this by removing the stray line "debug := @debug@" in Tools.mk.in.
>
> Reported-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Tested-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

Thanks, tried and now seems all ok about debug things on build FWIK.
> ---
> Cc: Fabio Fantoni <fabio.fantoni@m2r.biz>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: George Dunlap <george.dunlap@eu.citrix.com>
>
> Backport candidate for 4.6.
> ---
>   config/Tools.mk.in | 3 ---
>   1 file changed, 3 deletions(-)
>
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index 9bd5f6c..ccfe137 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -5,9 +5,6 @@ ifeq ($(CONFIG_RUMP),y)
>   XEN_OS              := NetBSDRump
>   endif
>   
> -# A debug build of tools?
> -debug               := @debug@
> -
>   # Tools path
>   BISON               := @BISON@
>   FLEX                := @FLEX@

Re: [PATCH] build: don't shadow debug with "@debug@" in tools build

[George Dunlap]

On 11/10/15 15:41, Wei Liu wrote:
> In 16181cbb (tools: Honor Config.mk debug value, rather than setting our
> own), configure doesn't set debug variable anymore. There is, however,
> one place that was missed. The file config/Tools.mk.in was still
> expecting a @debug@ value from configure. After 16181cbb that value
> remained "debug := @debug@" all the time because configure didn't
> substitute it.
> 
> The consequence was that we couldn't get a debug build even if debug was
> set to "y" in Config.mk.
> 
> Fix this by removing the stray line "debug := @debug@" in Tools.mk.in.
> 
> Reported-by: Fabio Fantoni <fabio.fantoni@m2r.biz>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Oops -- tested not turning it on, but didn't test turning it on. :-)

Acked-by: George Dunlap <george.dunlap@citrix.com>

> ---
> Cc: Fabio Fantoni <fabio.fantoni@m2r.biz>
> Cc: Ian Campbell <ian.campbell@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
> Cc: George Dunlap <george.dunlap@eu.citrix.com>
> 
> Backport candidate for 4.6.
> ---
>  config/Tools.mk.in | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index 9bd5f6c..ccfe137 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -5,9 +5,6 @@ ifeq ($(CONFIG_RUMP),y)
>  XEN_OS              := NetBSDRump
>  endif
>  
> -# A debug build of tools?
> -debug               := @debug@
> -
>  # Tools path
>  BISON               := @BISON@
>  FLEX                := @FLEX@
>