diff options
| author | gjb <gjb@FreeBSD.org> | 2014-04-26 00:51:07 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-04-26 00:51:07 +0000 |
| commit | c3fb610485bd783a9c6ad380d7c5f5d05c0decc8 (patch) | |
| tree | 7ff9740525653285e6ec38b1776912edc5f2e624 | |
| parent | 7d037e3a60114c023ee961b9b46c5697e454e731 (diff) | |
| download | FreeBSD-src-c3fb610485bd783a9c6ad380d7c5f5d05c0decc8.zip FreeBSD-src-c3fb610485bd783a9c6ad380d7c5f5d05c0decc8.tar.gz | |
MFC r264794:
Move xdev knobs from release/arm/release.sh and into an
XDEV_FLAGS variable in ${KERNCONF}.conf file.
Local changes:
Fix XDEV_FLAGS for stable/10 branch, in particular, remove
WITH_GCC_BOOTSTRAP=1 and add WITH_GNUCXX=1.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | release/arm/BEAGLEBONE.conf | 1 | ||||
| -rw-r--r-- | release/arm/PANDABOARD.conf | 1 | ||||
| -rw-r--r-- | release/arm/RPI-B.conf | 1 | ||||
| -rw-r--r-- | release/arm/WANDBOARD-QUAD.conf | 1 | ||||
| -rw-r--r-- | release/arm/ZEDBOARD.conf | 1 | ||||
| -rwxr-xr-x | release/arm/release.sh | 3 |
6 files changed, 6 insertions, 2 deletions
diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf index 1fee5e6..f15ac1f 100644 --- a/release/arm/BEAGLEBONE.conf +++ b/release/arm/BEAGLEBONE.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="BEAGLEBONE" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf index b6ffe45..57e03df 100644 --- a/release/arm/PANDABOARD.conf +++ b/release/arm/PANDABOARD.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="PANDABOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf index d7a9dca..b2886e4 100644 --- a/release/arm/RPI-B.conf +++ b/release/arm/RPI-B.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="RPI-B" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf index 4c4a9e9..8efb211 100644 --- a/release/arm/WANDBOARD-QUAD.conf +++ b/release/arm/WANDBOARD-QUAD.conf @@ -22,6 +22,7 @@ EMBEDDEDBUILD=1 EMBEDDEDPORTS="lang/python textproc/gsed" XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="WANDBOARD-QUAD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf index 106ac8f..9a1cb65 100644 --- a/release/arm/ZEDBOARD.conf +++ b/release/arm/ZEDBOARD.conf @@ -21,6 +21,7 @@ CHROOTDIR="/scratch" EMBEDDEDBUILD=1 XDEV="arm" XDEV_ARCH="armv6" +XDEV_FLAGS="WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1" KERNEL="ZEDBOARD" CROCHETSRC="https://github.com/kientzle/crochet-freebsd" CROCHETBRANCH="trunk" diff --git a/release/arm/release.sh b/release/arm/release.sh index c067fe9..c2b2a1b 100755 --- a/release/arm/release.sh +++ b/release/arm/release.sh @@ -94,8 +94,7 @@ install_uboot() { main() { # Build the 'xdev' target for crochet. eval chroot ${CHROOTDIR} make -C /usr/src \ - WITH_GCC=1 WITH_GNUCXX=1 WITHOUT_CLANG_IS_CC=1 \ - XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ + ${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \ ${WORLD_FLAGS} xdev # Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints |
