Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that ctf is fixed for at least amd64, go back to an equivalent to the 

original functionality, use the tool only if it exists.
This commit is contained in:
christos 2013-01-18 19:32:09 +00:00
parent 45be9f97eb
commit 7097ec6251
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.717 2013/01/11 12:55:29 matt Exp $ # $NetBSD: bsd.own.mk,v 1.718 2013/01/18 19:32:09 christos Exp $
# This needs to be before bsd.init.mk # This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE) .if defined(BSD_MK_COMPAT_FILE)
@ -462,6 +462,11 @@ CXX= ${TOOL_CXX.${ACTIVE_CXX}}
FC= ${TOOL_FC.${ACTIVE_FC}} FC= ${TOOL_FC.${ACTIVE_FC}}
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}} OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
.if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
CTFCONVERT= ${TOOL_CTFCONVERT}
CTFMERGE= ${TOOL_CTFMERGE}
.endif
# OBJCOPY flags to create a.out binaries for old firmware # OBJCOPY flags to create a.out binaries for old firmware
# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
.if ${MACHINE_CPU} == "arm" .if ${MACHINE_CPU} == "arm"

13
share/mk/sys.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: sys.mk,v 1.112 2013/01/17 17:33:16 christos Exp $ # $NetBSD: sys.mk,v 1.113 2013/01/18 19:32:09 christos Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94 # @(#)sys.mk 8.2 (Berkeley) 3/21/94
# #
# This file contains the basic rules for make(1) and is read first # This file contains the basic rules for make(1) and is read first
@ -41,13 +41,12 @@ COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS} -c
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
# C Type Format data is required for DTrace # C Type Format data is required for DTrace
# XXX TBD VERSION is not defined CTFFLAGS ?= -L VERSION
# XXX Broken: disable, see commit message CTFMFLAGS ?= -t -L VERSION
#CTFFLAGS ?= -L VERSION
#CTFMFLAGS ?= -t -L VERSION
#CTFCONVERT ?= ${TOOL_CTFCONVERT} # We don't define these here, we let the bsd.own.mk to do it
#CTFMERGE ?= ${TOOL_CTFMERGE} #CTFCONVERT ?= ctfconvert
#CTFMERGE ?= ctfmerge
CXX?= c++ CXX?= c++
CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99:N-Wold-style-definition:N-Wno-format-zero-length} CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99:N-Wold-style-definition:N-Wno-format-zero-length}