diff options
| author | gjb <gjb@FreeBSD.org> | 2014-08-26 15:31:56 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-08-26 15:31:56 +0000 |
| commit | 05de13180a92cec874e10c996514de6d1d4099c8 (patch) | |
| tree | 14ca5f2648037dfa9c098e143625ef9289c42eb8 | |
| parent | 5ad02b7b788f94551e7ac596c6e0522cb7d376b8 (diff) | |
| download | FreeBSD-src-05de13180a92cec874e10c996514de6d1d4099c8.zip FreeBSD-src-05de13180a92cec874e10c996514de6d1d4099c8.tar.gz | |
- Update stable/10 to 10.1-PRERELEASE now that the
code slush is in effect. (Forgotten on the 22nd.)
- Set the 10.1 as the .Fx mdoc(7) default.
- Update the TARGET_TRIPLE and BUILD_TRIPLE for clang(1)
to reflect 10.1.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | gnu/usr.bin/groff/tmac/mdoc.local | 2 | ||||
| -rw-r--r-- | lib/clang/clang.build.mk | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 6b2791b..c46cc9c 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~10.0 +.ds doc-default-operating-system FreeBSD\~10.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.4 7.4 diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 8590f04..33a7d7c 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -27,8 +27,8 @@ TARGET_ABI= gnueabi TARGET_ABI= unknown .endif -TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0 -BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0 +TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.1 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5e58584..7d97b8d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -31,8 +31,8 @@ # $FreeBSD$ TYPE="FreeBSD" -REVISION="10.0" -BRANCH="STABLE" +REVISION="10.1" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi |
