Module Name: src
Committed By: adam
Date: Thu May 19 06:09:36 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Reverting last change; joerg has a better approach
To generate a diff of this commit:
cvs rdiff -u -r1.665 -r1.666 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.665 src/share/mk/bsd.own.mk:1.666
--- src/share/mk/bsd.own.mk:1.665 Wed May 18 13:08:14 2011
+++ src/share/mk/bsd.own.mk Thu May 19 06:09:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.665 2011/05/18 13:08:14 adam Exp $
+# $NetBSD: bsd.own.mk,v 1.666 2011/05/19 06:09:36 adam Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -47,7 +47,7 @@
TOOLCHAIN_MISSING?= no
# default to GCC4
-.if !defined(HAVE_GCC) && !defined(HAVE_PCC) && !defined(HAVE_LLVM)
+.if !defined(HAVE_GCC) && !defined(HAVE_PCC)
HAVE_GCC= 4
.endif
@@ -207,14 +207,6 @@
OBJC= false
.endif
-.if defined(HAVE_LLVM) && ${USETOOLS_LLVM:Uyes} == "yes"
-CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang
-CPP= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-cpp
-CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang++
-FC= false
-OBJC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang
-.endif
-
#
# Make sure DESTDIR is set, so that builds with these tools always
# get appropriate -nostdinc, -nostdlib, etc. handling. The default is
