From owner-p4-projects@FreeBSD.ORG  Wed Aug 28 09:53:11 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 1535C8B9; Wed, 28 Aug 2013 09:53:11 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id CCE898B7
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 09:53:10 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B80D629F6
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 09:53:10 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S9rAhs021135
 for <perforce@freebsd.org>; Wed, 28 Aug 2013 09:53:10 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r7S9rArg021132
 for perforce@freebsd.org; Wed, 28 Aug 2013 09:53:10 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 28 Aug 2013 09:53:10 GMT
Message-Id: <201308280953.r7S9rArg021132@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 490999 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Aug 2013 09:53:11 -0000

http://p4web.freebsd.org/@@490999?ac=10

Change 490999 by brooks@brooks_zenith on 2013/08/28 09:52:09

	Don't do LLVM instrumentation when EARLY_BUILD is defined as it
	is when building aicasm.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#10 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#10 (text+ko) ====

@@ -54,7 +54,8 @@
 .if defined(SRCS) && !empty(SRCS)
 # XXX: currently tesla can't handle C++ so build C++ code normaly in the
 # WITH_TESLA case.
-.if defined(NO_LLVM_IR) || ${MK_LLVM_INSTRUMENTED} == "no" || \
+.if defined(EARLY_BUILD) || defined(NO_LLVM_IR) || \
+    ${MK_LLVM_INSTRUMENTED} == "no" || \
     (${MK_TESLA} != "no" && defined(PROG_CXX))
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 .else
@@ -89,7 +90,7 @@
 .endif
 .endif
 
-.if ${MK_TESLA} != "no"
+.if ${MK_TESLA} != "no" && !defined(EARLY_BUILD)
 tesla.manifest: ${TESLA_FILES}
 	cat ${TESLA_FILES} > ${.TARGET}