Date: Wed, 27 Feb 2013 23:32:39 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 222446 for review Message-ID: <201302272332.r1RNWdJq067466@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@222446?ac=10 Change 222446 by brooks@brooks_zenith on 2013/02/27 23:31:46 Add CROSS_COMPILER_PATH, CROSS_BINUTILS_PATH, and CROSS_TOOLCHAIN_PATH variables to make it easier to set X* commands. Extend X* support to a likely set of binutils. Affected files ... .. //depot/projects/ctsrd/tesla/src/Makefile.inc1#8 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/Makefile.inc1#8 (text+ko) ==== @@ -280,9 +280,32 @@ .if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif -XCC?= ${CC} -XCXX?= ${CXX} -XCPP?= ${CPP} + +.if defined(CROSS_TOOLCHAIN_PATH) +CROSS_COMPILER_PATH?=${CROSS_TOOLCHAIN_PATH} +CROSS_BINUTILS_PATH?=${CROSS_TOOLCHAIN_PATH} +.endif +XCOMPILERS= CC CXX CPP +.for COMPILER in ${XCOMPILERS} +.if defined(CROSS_COMPILER_PATH) +X${COMPILER}?= ${CROSS_COMPILER_PATH}/${${COMPILER}} +.else +X${COMPILER}?= ${${COMPILER}} +.endif +.endfor +XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS +.for BINUTIL in ${XBINUTILS} +.if defined(CROSS_BINUTILS_PATH) +X${BINUTIL}?= ${CROSS_BINUTILS_PATH}/${${BINUTIL}} +.else +X${BINUTIL}?= ${${BINUTIL}} +.endif +.endfor +WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ + CPP="${XCPP} ${XFLAGS}" \ + AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \ + OBJDUMP=${XOBJDUMP} RANLIB=${RANLIB} STRINGS=${XSTRINGS} + .if ${XCC:T:Mgcc} == "gcc" WMAKE_COMPILER_TYPE= gcc .elif ${XCC:T:Mclang} == "clang" @@ -292,8 +315,14 @@ .else WMAKE_COMPILER_TYPE= clang .endif + .if ${XCC:M/*} -XFLAGS= --sysroot=${WORLDTMP} -B${WORLDTMP}/usr/bin +XFLAGS= --sysroot=${WORLDTMP} +.if defined(CROSS_BINUTILS_PATH) +XFLAGS+= -B${CROSS_BINUTILS_PATH} +.else +XFLAGS+= -B${WORLDTMP}/usr/bin +.endif .if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang" .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \ ${MK_ARM_EABI} != "no" @@ -305,9 +334,8 @@ XFLAGS+= -target ${TARGET_TRIPLE} .endif .endif -WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \ - CPP="${XCPP} ${XFLAGS}" \ - COMPILER_TYPE=${WMAKE_COMPILER_TYPE} + +WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" @@ -1303,7 +1331,7 @@ .endif .endif -.if ${MK_BINUTILS} != "no" +.if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no" _binutils= gnu/usr.bin/binutils .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302272332.r1RNWdJq067466>