From owner-p4-projects@FreeBSD.ORG  Thu Mar  7 14:42:45 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id C84E5C5C; Thu,  7 Mar 2013 14:42:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8A6BFC5A
 for <perforce@freebsd.org>; Thu,  7 Mar 2013 14:42:45 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 791FBEAB
 for <perforce@freebsd.org>; Thu,  7 Mar 2013 14:42:45 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r27Egj2R063996
 for <perforce@freebsd.org>; Thu, 7 Mar 2013 14:42:45 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r27Egjb1063993
 for perforce@freebsd.org; Thu, 7 Mar 2013 14:42:45 GMT
 (envelope-from jonathan@freebsd.org)
Date: Thu, 7 Mar 2013 14:42:45 GMT
Message-Id: <201303071442.r27Egjb1063993@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 222699 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: Thu, 07 Mar 2013 14:42:46 -0000

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

Change 222699 by jonathan@jonathan-on-kent on 2013/03/07 14:42:19

	Pass cross-building flags XFLAGS to buildenv environment, allowing us to find tesla.h and libtesla.so.1.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/Makefile.inc1#11 edit
.. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#4 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#11 (text+ko) ====

@@ -304,7 +304,8 @@
 WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
 		CPP="${XCPP} ${XFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
-		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
+		XFLAGS="${XFLAGS}"
 
 .if ${XCC:T:Mgcc} == "gcc"
 WMAKE_COMPILER_TYPE=	gcc

==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#4 (text+ko) ====

@@ -253,7 +253,7 @@
 	${CTFCONVERT_CMD}
 
 .c.tesla:
-	${TESLA} analyse ${.IMPSRC} -o ${.TARGET} -- ${CFLAGS} -D TESLA
+	${TESLA} analyse ${.IMPSRC} -o ${.TARGET} -- ${CFLAGS} ${XFLAGS} -D TESLA
 
 .cc .cpp .cxx .C:
 	${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}