===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/Makefile.cross	2017/08/11 19:36:37	1.96
--- src/Makefile.cross	2017/09/12 08:16:13	1.97
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.96 2017/08/11 19:36:37 drahn 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.97 2017/09/12 08:16:13 mpi 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
***************
*** 83,92 ****
--- 83,98 ----
  .if !empty(CLANG_ARCH:M${_arch})
  COMPILER_VERSION=clang
  BUILD_CLANG=yes
+ CC=clang
+ CXX=clang++
  .elif !empty(GCC3_ARCH:M${_arch})
  COMPILER_VERSION=gcc3
+ CC=gcc
+ CXX=g++
  .else
  COMPILER_VERSION=gcc4
+ CC=gcc
+ CXX=g++
  .endif
  
  .if !empty(PIE_ARCH:M${_arch})
***************
*** 190,195 ****
--- 196,202 ----
  	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    env CROSSDIR=${CROSSDIR} \
+ 	    CC=${CC} CXX=${CXX} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
***************
*** 228,234 ****
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} obj)
  	(cd ${.CURDIR}/gnu/usr.bin/clang; \
! 	    CC=clang CXX=clang++ \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} all)
--- 235,241 ----
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} obj)
  	(cd ${.CURDIR}/gnu/usr.bin/clang; \
! 	    CC=${CC} CXX=${CXX} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    MACHINE_ARCH=${TARGET_ARCH} \
  	    ${MAKE} all)
***************
*** 258,263 ****
--- 265,271 ----
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    CROSSDIR=${CROSSDIR} \
+ 	    CC=${CC} CXX=${CXX} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
***************
*** 286,291 ****
--- 294,301 ----
  	    PATH=${CROSSPATH} ${MAKE} depend  )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
  	    env CROSSDIR=${CROSSDIR} \
+ 	    COMPILER_VERSION=${COMPILER_VERSION} \
+ 	    CC=${CC} CXX=${CXX} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
***************
*** 293,298 ****
--- 303,309 ----
  	    ${MAKE} all )
  	(cd ${.CURDIR}/gnu/usr.bin/cc; \
  	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+ 	    COMPILER_VERSION=${COMPILER_VERSION} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \