Module Name: src
Committed By: christos
Date: Fri Apr 4 01:20:13 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add NOCTF
To generate a diff of this commit:
cvs rdiff -u -r1.794 -r1.795 src/share/mk/bsd.own.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.794 src/share/mk/bsd.own.mk:1.795
--- src/share/mk/bsd.own.mk:1.794 Thu Apr 3 14:29:11 2014
+++ src/share/mk/bsd.own.mk Thu Apr 3 21:20:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.794 2014/04/03 18:29:11 riastradh Exp $
+# $NetBSD: bsd.own.mk,v 1.795 2014/04/04 01:20:12 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -507,7 +507,7 @@ FC= ${TOOL_FC.${ACTIVE_FC}}
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
# Override with tools versions if needed
-.if ${MKCTF:Uno} != "no"
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
CTFCONVERT= ${TOOL_CTFCONVERT}
CTFMERGE= ${TOOL_CTFMERGE}
.endif
