Skip to content

Commit

Permalink
Fix native-xtools breakage when building a gcc enabled target on a clang
Browse files Browse the repository at this point in the history
enabled host.  Build a one-off gperf and put it in the PATH for the rest
of the target so the ONE call to gperf by the gcc build picks it up and
DTRT.

Reviewed by:	imp
  • Loading branch information
seanbruno committed Apr 30, 2015
1 parent acc3b0b commit dc27e61
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions Makefile.inc1
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,22 @@ NXBMAKE= ${NXBENV} ${MAKE} \
MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
MK_LLDB=no

# native-xtools is the current target for qemu-user cross builds of ports
# via poudriere and the imgact_binmisc kernel module.
# For non-clang enabled targets that are still using the in tree gcc
# we must build a gperf binary for one instance of its Makefiles. On
# clang-enabled systems, the gperf binary is obsolete.
native-xtools: .MAKE
.if ${MK_GCC_BOOTSTRAP} != "no"
mkdir -p ${OBJTREE}/gperf_for_gcc/usr/bin
${_+_}@${ECHODIR} "===> ${_gperf} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_gperf} && \
${NXBMAKE} DIRPRFX=${_gperf}/ obj && \
${NXBMAKE} DIRPRFX=${_gperf}/ depend && \
${NXBMAKE} DIRPRFX=${_gperf}/ all && \
${NXBMAKE} DIRPRFX=${_gperf}/ DESTDIR=${OBJTREE}/gperf_for_gcc install
PATH=${PATH}:${OBJTREE}/gperf_for_gcc/usr/bin
.endif
mkdir -p ${OBJTREE}/nxb-bin/bin
mkdir -p ${OBJTREE}/nxb-bin/sbin
mkdir -p ${OBJTREE}/nxb-bin/usr
Expand Down

0 comments on commit dc27e61

Please sign in to comment.