===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.93
retrieving revision 1.94
diff -c -r1.93 -r1.94
*** src/Makefile.cross	2017/03/21 10:41:33	1.93
--- src/Makefile.cross	2017/05/23 14:57:30	1.94
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.93 2017/03/21 10:41:33 patrick Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.94 2017/05/23 14:57:30 patrick Exp $
  
  cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
  cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
***************
*** 82,87 ****
--- 82,88 ----
  .for _arch in ${TARGET_ARCH}
  .if !empty(CLANG_ARCH:M${_arch})
  COMPILER_VERSION=clang
+ BUILD_CLANG=yes
  .elif !empty(GCC3_ARCH:M${_arch})
  COMPILER_VERSION=gcc3
  .else
***************
*** 231,236 ****
--- 232,238 ----
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} depend)
  	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+ 	    CC=clang CXX=clang++ \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} all)
***************
*** 241,249 ****
--- 243,254 ----
  	    ${MAKE} install)
  	mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang
  	mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++
+ 	mv ${CROSSDIR}/usr/bin/ld ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld
  	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang
+ 	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-ld
  	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
  	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
+ 	ln -sf ${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
  	echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; \
  	chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc;
  	echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --driver-mode=g++ --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; \
***************
*** 325,331 ****
  	    BSDOBJDIR=${CROSSDIR}/usr/obj; \
  	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
  	(cd ${.CURDIR}/lib; \
! 	    for lib in csu libc; do \
  	    (cd $$lib; \
  	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  		    ${MAKE} depend all ;\
--- 330,336 ----
  	    BSDOBJDIR=${CROSSDIR}/usr/obj; \
  	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
  	(cd ${.CURDIR}/lib; \
! 	    for lib in csu libcompiler_rt libc; do \
  	    (cd $$lib; \
  	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  		    ${MAKE} depend all ;\