mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-22 16:42:56 -08:00
Code

Fix cross-compiling GCC toolchains on Clang archs.

Browse Source 
ok patrick@
This commit is contained in:
mpi 2017-09-12 08:16:13 +00:00
parent 0b33bdc1c5
commit c51441d01c
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.cross
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.cross,v 1.96 2017/08/11 19:36:37 drahn Exp $ # $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-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@ -83,10 +83,16 @@ CROSSGCC= ${CROSSDIR}/.gcc_done
.if !empty(CLANG_ARCH:M${_arch}) .if !empty(CLANG_ARCH:M${_arch})
COMPILER_VERSION=clang COMPILER_VERSION=clang
BUILD_CLANG=yes BUILD_CLANG=yes
CC=clang
CXX=clang++
.elif !empty(GCC3_ARCH:M${_arch}) .elif !empty(GCC3_ARCH:M${_arch})
COMPILER_VERSION=gcc3 COMPILER_VERSION=gcc3
CC=gcc
CXX=g++
.else .else
COMPILER_VERSION=gcc4 COMPILER_VERSION=gcc4
CC=gcc
CXX=g++
.endif .endif
.if !empty(PIE_ARCH:M${_arch}) .if !empty(PIE_ARCH:M${_arch})
@ -190,6 +196,7 @@ ${CROSSBINUTILS}: ${CROSSINCLUDES}
PATH=${CROSSPATH} \ PATH=${CROSSPATH} \
${MAKE} -f Makefile.bsd-wrapper depend && \ ${MAKE} -f Makefile.bsd-wrapper depend && \
env CROSSDIR=${CROSSDIR} \ env CROSSDIR=${CROSSDIR} \
CC=${CC} CXX=${CXX} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
PIE_DEFAULT=${PIE_DEFAULT} \ PIE_DEFAULT=${PIE_DEFAULT} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@ -228,7 +235,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
MACHINE_ARCH=${TARGET_ARCH} \ MACHINE_ARCH=${TARGET_ARCH} \
${MAKE} obj) ${MAKE} obj)
(cd ${.CURDIR}/gnu/usr.bin/clang; \ (cd ${.CURDIR}/gnu/usr.bin/clang; \
CC=clang CXX=clang++ \ CC=${CC} CXX=${CXX} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
MACHINE_ARCH=${TARGET_ARCH} \ MACHINE_ARCH=${TARGET_ARCH} \
${MAKE} all) ${MAKE} all)
@ -258,6 +265,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
CROSSDIR=${CROSSDIR} \ CROSSDIR=${CROSSDIR} \
CC=${CC} CXX=${CXX} \
${MAKE} -f Makefile.bsd-wrapper all && \ ${MAKE} -f Makefile.bsd-wrapper all && \
env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install) PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install)
@ -286,6 +294,8 @@ ${CROSSGCC}: ${CROSSBINUTILS}
PATH=${CROSSPATH} ${MAKE} depend ) PATH=${CROSSPATH} ${MAKE} depend )
(cd ${.CURDIR}/gnu/usr.bin/cc; \ (cd ${.CURDIR}/gnu/usr.bin/cc; \
env CROSSDIR=${CROSSDIR} \ env CROSSDIR=${CROSSDIR} \
COMPILER_VERSION=${COMPILER_VERSION} \
CC=${CC} CXX=${CXX} \
PIE_DEFAULT=${PIE_DEFAULT} \ PIE_DEFAULT=${PIE_DEFAULT} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@ -293,6 +303,7 @@ ${CROSSGCC}: ${CROSSBINUTILS}
${MAKE} all ) ${MAKE} all )
(cd ${.CURDIR}/gnu/usr.bin/cc; \ (cd ${.CURDIR}/gnu/usr.bin/cc; \
env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \ env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
COMPILER_VERSION=${COMPILER_VERSION} \
PIE_DEFAULT=${PIE_DEFAULT} \ PIE_DEFAULT=${PIE_DEFAULT} \
MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \