From owner-p4-projects@FreeBSD.ORG  Sun Sep  1 22:03:24 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8A3D9B2C; Sun,  1 Sep 2013 22:03:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4CAEBB2A
 for <perforce@freebsd.org>; Sun,  1 Sep 2013 22:03:24 +0000 (UTC)
 (envelope-from novazeta@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 3942B27FD
 for <perforce@freebsd.org>; Sun,  1 Sep 2013 22:03:24 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r81M3OpH074099
 for <perforce@freebsd.org>; Sun, 1 Sep 2013 22:03:24 GMT
 (envelope-from novazeta@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r81M3Ofl074096
 for perforce@freebsd.org; Sun, 1 Sep 2013 22:03:24 GMT
 (envelope-from novazeta@FreeBSD.org)
Date: Sun, 1 Sep 2013 22:03:24 GMT
Message-Id: <201309012203.r81M3Ofl074096@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 novazeta@FreeBSD.org using -f
From: Khilan Gudka <novazeta@FreeBSD.org>
Subject: PERFORCE change 545955 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: Sun, 01 Sep 2013 22:03:24 -0000

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

Change 545955 by novazeta@novazeta_zenith on 2013/09/01 22:02:41

	Libraries now have SOAAP include folder in CFLAGS too

Affected files ...

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

Differences ...

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

@@ -663,6 +663,10 @@
 .endif
 .endif
 
+.if defined(WITH_LLVM_INSTRUMENTED) && defined(WITH_SOAAP)
+CFLAGS+= -I${SOAAP_SOURCE_DIR}/include
+.endif
+
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300)

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

@@ -89,9 +89,6 @@
 	fi
 
 .if ${MK_SOAAP} != "no"
-CFLAGS+= -I$(SOAAP_SOURCE_DIR)/include
-.endif
-.if ${MK_SOAAP} != "no"
 ${PROG}.soaap: ${PROG}.${LLVM_IR_TYPE}-a
 	${OPT} -load $(SOAAP_BUILD_DIR)/libsoaap.so -soaap ${SOAAP_FLAGS} -o /dev/null ${PROG}.${LLVM_IR_TYPE}-a