Date: Wed, 23 Apr 2014 01:27:53 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r264792 - stable/10/release/arm Message-ID: <201404230127.s3N1RrMh041248@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Apr 23 01:27:53 2014 New Revision: 264792 URL: http://svnweb.freebsd.org/changeset/base/264792 Log: MFC r264518, r264697, r264698, r264703: r264518: Fix armv6 build failure: "armv6-freebsd-gcc: not found" r264697: 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. r264698: Fix EOL escape. r264703: Apply a slightly different color hammer to arm/release.sh: - gcc(1) fails to build usr.bin/dtc - lack of WITH_GNUCXX=1 causes cc1plus(1) calls to fail - u-boot fails to build with clang (hard-coded gcc(1) calls) Implement the proper incantation of WITH_/WITHOUT_ knobs to get arm snapshot builds working again. Since the cc(1) binary no longer needs to be cc(1) instead of clang(1), remove the chroot(8) post-install cc(1) overwrite. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/arm/release.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/arm/release.sh ============================================================================== --- stable/10/release/arm/release.sh Tue Apr 22 22:12:24 2014 (r264791) +++ stable/10/release/arm/release.sh Wed Apr 23 01:27:53 2014 (r264792) @@ -92,14 +92,10 @@ install_uboot() { } main() { - # Build gcc for use in the chroot for arm builds. - # This is not '-j'-safe, so force '-j1' to allow using - # additional, non-'-j' options specified in WORLD_FLAGS. - 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 \ - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} WITH_GCC=1 \ + WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \ + XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ ${WORLD_FLAGS} xdev # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404230127.s3N1RrMh041248>