Module Name: src
Committed By: christos
Date: Fri Jan 18 19:32:10 UTC 2013
Modified Files:
src/share/mk: bsd.own.mk sys.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.717 -r1.718 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.112 -r1.113 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.717 src/share/mk/bsd.own.mk:1.718
--- src/share/mk/bsd.own.mk:1.717 Fri Jan 11 07:55:29 2013
+++ src/share/mk/bsd.own.mk Fri Jan 18 14:32:09 2013
@@ -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
.if defined(BSD_MK_COMPAT_FILE)
@@ -462,6 +462,11 @@ CXX= ${TOOL_CXX.${ACTIVE_CXX}}
FC= ${TOOL_FC.${ACTIVE_FC}}
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
# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
.if ${MACHINE_CPU} == "arm"
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.112 src/share/mk/sys.mk:1.113
--- src/share/mk/sys.mk:1.112 Thu Jan 17 12:33:16 2013
+++ src/share/mk/sys.mk Fri Jan 18 14:32:09 2013
@@ -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
#
# This file contains the basic rules for make(1) and is read first
@@ -41,13 +41,12 @@ COMPILE.c?= ${CC} ${CFLAGS} ${CPPFLAGS}
LINK.c?= ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
# C Type Format data is required for DTrace
-# XXX TBD VERSION is not defined
-# XXX Broken: disable, see commit message
-#CTFFLAGS ?= -L VERSION
-#CTFMFLAGS ?= -t -L VERSION
+CTFFLAGS ?= -L VERSION
+CTFMFLAGS ?= -t -L VERSION
-#CTFCONVERT ?= ${TOOL_CTFCONVERT}
-#CTFMERGE ?= ${TOOL_CTFMERGE}
+# We don't define these here, we let the bsd.own.mk to do it
+#CTFCONVERT ?= ctfconvert
+#CTFMERGE ?= ctfmerge
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}
