Re: toolchain/48627: CTFCONVERT is set depending on properties of the build host

[Ryota Ozaki <ozaki-r%iij.ad.jp@localhost>]

(2014/03/01 23:45), martin%NetBSD.org@localhost wrote:
>> Number:         48627
>> Category:       toolchain
>> Synopsis:       CTFCONVERT is set depending on properties of the build host
>> Confidential:   no
>> Severity:       serious
>> Priority:       medium
>> Responsible:    toolchain-manager
>> State:          open
>> Class:          sw-bug
>> Submitter-Id:   net
>> Arrival-Date:   Sat Mar 01 14:45:00 +0000 2014
>> Originator:     Martin Husemann
>> Release:        NetBSD 6.99.32
>> Organization:
> The NetBSD Foundation, Inc.
>> Environment:
> System: NetBSD night-owl.duskware.de 6.99.32 NetBSD 6.99.32 (NIGHT-OWL) #231: 
> Sat Feb 22 10:32:03 CET 2014 
> martin%night-owl.duskware.de@localhost:/usr/src/sys/arch/amd64/compile/NIGHT-OWL
>  amd64
> Architecture: x86_64
> Machine: amd64
>> Description:
> 
> In sys.mk CTFCONVERT is defined, if /usr/bin/ctfconvert exists on the build
> host. This is obviously broken (see PR 48623 for fallout).
> 
> This needs to check MKDTRACE or similar, and ideally be overridable by
> the makefile (especially when creating a.out format kernels or bootloaders).
> 
>> How-To-Repeat:
> code inspection
> 
>> Fix:
> n/a
> 

Possible fix for the issue. I don't know how to make it
overridable yet.

Thanks,
  ozaki-r

Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvs/cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.775
diff -u -r1.775 bsd.own.mk
--- share/mk/bsd.own.mk 2 Mar 2014 03:33:29 -0000       1.775
+++ share/mk/bsd.own.mk 3 Mar 2014 05:10:42 -0000
@@ -489,7 +489,7 @@
 OBJC=          ${TOOL_OBJC.${ACTIVE_OBJC}}

 # Override with tools versions if needed
-.if exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
+.if defined(MKDTRACE) && (${MKDTRACE} != "no") &&
exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
 CTFCONVERT=    ${TOOL_CTFCONVERT}
 CTFMERGE=      ${TOOL_CTFMERGE}
 .endif
Index: share/mk/sys.mk
===================================================================
RCS file: /cvs/cvsroot/src/share/mk/sys.mk,v
retrieving revision 1.120
diff -u -r1.120 sys.mk
--- share/mk/sys.mk     2 Jan 2014 19:25:08 -0000       1.120
+++ share/mk/sys.mk     3 Mar 2014 05:10:42 -0000
@@ -48,7 +48,7 @@

 # We have to define these here, because if we don't the rules below will
 # not work
-.if exists(/usr/bin/ctfconvert) && exists(/usr/bin/ctfmerge)
+.if defined(MKDTRACE) && (${MKDTRACE} != "no") &&
exists(/usr/bin/ctfconvert) && exists(/usr/bin/ctfmerge)
 CTFCONVERT     ?=      ctfconvert
 CTFMERGE       ?=      ctfmerge
 .endif