[src/trunk]: src/share/mk Use HAVE_LLVM, not MKLLVM, in tests related to the ...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e4f8ac4b445
branches:  trunk
changeset: 802856:5e4f8ac4b445
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Oct 05 17:08:46 2014 +0000

description:
Use HAVE_LLVM, not MKLLVM, in tests related to the active compiler.

Fixes problems in a build with MKLLVM=yes HAVE_LLVM=no,
where this error interacted with settings in
src/external/gpl3/gcc/lib/libgcc/Makefile.inc to cause
some object files to be omitted from the libgcc_s library.

diffstat:

 share/mk/bsd.own.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 5f3f4bc88245 -r 5e4f8ac4b445 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sun Oct 05 14:13:14 2014 +0000
+++ b/share/mk/bsd.own.mk       Sun Oct 05 17:08:46 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.835 2014/09/19 17:45:42 matt Exp $
+#      $NetBSD: bsd.own.mk,v 1.836 2014/10/05 17:08:46 apb Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -98,7 +98,7 @@
 _LIBC_COMPILER_RT.powerpc64=   yes
 _LIBC_COMPILER_RT.x86_64=      yes
 
-.if ${MKLLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes"
+.if ${HAVE_LLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes"
 HAVE_LIBGCC?=  no
 .else
 HAVE_LIBGCC?=  yes
@@ -106,7 +106,7 @@
 
 
 # ia64 is not support
-.if ${MKLLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*)
+.if ${HAVE_LLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*)
 HAVE_LIBGCC_EH?=       no
 .else
 HAVE_LIBGCC_EH?=       yes