diff options
| author | ed <ed@FreeBSD.org> | 2010-06-12 15:13:36 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2010-06-12 15:13:36 +0000 |
| commit | 2de547ee0f5a2ebd61fc1aa8932042043bbf680f (patch) | |
| tree | 73b217e0a3af5355f1304ab49f39b70ad5536d1b | |
| parent | bbe91d0e0f42157f62abeae4e5e6ce4c66e1dace (diff) | |
| download | FreeBSD-src-2de547ee0f5a2ebd61fc1aa8932042043bbf680f.zip FreeBSD-src-2de547ee0f5a2ebd61fc1aa8932042043bbf680f.tar.gz | |
Do the branding right this time.
I've looked at other places in the source tree where CLANG_VENDOR is
used and I suspect it might not be safe to use newlines here.
CLANG_VENDOR should just be defined to "FreeBSD ", just like the latest
Clang preview in OS X uses "Apple ". Properly use SVN_REVISION to define
it to the imported revision of Clang. I do want to have a date in there,
so slightly modify the code to support CLANG_VENDOR_SUFFIX.
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Basic/Version.cpp | 3 | ||||
| -rw-r--r-- | lib/clang/clang.build.mk | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/Basic/Version.cpp b/contrib/llvm/tools/clang/lib/Basic/Version.cpp index e0c2336..86c5e55 100644 --- a/contrib/llvm/tools/clang/lib/Basic/Version.cpp +++ b/contrib/llvm/tools/clang/lib/Basic/Version.cpp @@ -70,6 +70,9 @@ std::string getClangFullVersion() { #endif OS << "clang version " CLANG_VERSION_STRING " (" << getClangFullRepositoryVersion() << ')'; +#ifdef CLANG_VENDOR_SUFFIX + OS << CLANG_VENDOR_SUFFIX; +#endif return OS.str(); } diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 8e2fe45..d6eaaa4 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -11,7 +11,8 @@ CFLAGS+=-I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \ TARGET_ARCH?= ${MACHINE_ARCH} # XXX: 8.0, to keep __FreeBSD_cc_version happy CFLAGS+=-DLLVM_HOSTTRIPLE=\"${TARGET_ARCH}-undermydesk-freebsd9.0\" \ - -DCLANG_VENDOR=\"clang\ r104832\ 20100610\ [FreeBSD]\\n\" + -DCLANG_VENDOR=\"FreeBSD\ \" -DSVN_REVISION=\"104832\" \ + -DCLANG_VENDOR_SUFFIX=\"\ 20100612\" .PATH: ${LLVM_SRCS}/${SRCDIR} |
