Now that cc(1) is a link to clang(1) we need to explicitly set CC, CXX
and COMPILER_VERSION to cross-compile gcc4 architecture toolchains.
ok?
Index: Makefile.cross
===================================================================
RCS file: /cvs/src/Makefile.cross,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile.cross
--- Makefile.cross 11 Aug 2017 19:36:37 -0000 1.96
+++ Makefile.cross 11 Sep 2017 09:22:30 -0000
@@ -83,10 +83,16 @@ CROSSGCC= ${CROSSDIR}/.gcc_done
.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,6 +196,7 @@ ${CROSSBINUTILS}: ${CROSSINCLUDES}
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,7 +235,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
MACHINE_ARCH=${TARGET_ARCH} \
${MAKE} obj)
(cd ${.CURDIR}/gnu/usr.bin/clang; \
- CC=clang CXX=clang++ \
+ CC=${CC} CXX=${CXX} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
MACHINE_ARCH=${TARGET_ARCH} \
${MAKE} all)
@@ -258,6 +265,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
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,6 +294,8 @@ ${CROSSGCC}: ${CROSSBINUTILS}
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,6 +303,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
${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} \
