When building the 'xdev' target when WITH_GCC=1 and

WITHOUT_CLANG_IS_CC=1, it appears WITHOUT_CLANG=1 must
also be set.

While here, reorder the lines to put the WITH_* and
WITHOUT_* entries on the same line.

MFC After:	3 days
X-MFC-With:	r264518
Tested on:	stable/10@r264677
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2014-04-20 16:33:28 +00:00
parent 8772ff83ee
commit 2093b3b701

View File

@ -98,8 +98,9 @@ main() {
eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
# Build the 'xdev' target for crochet.
eval chroot ${CHROOTDIR} make -C /usr/src WITHOUT_CLANG_IS_CC=1 \
XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \
eval chroot ${CHROOTDIR} make -C /usr/src \
WITHOUT_CLANG_IS_CC=1 WITHOUT_CLANG=1 WITH_GCC=1 \
XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH}
${WORLD_FLAGS} xdev
# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints