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.
This commit is contained in:
parent
f1bb758d4b
commit
c1fe4c5343
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=209107
@ -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();
|
||||
}
|
||||
|
||||
|
@ -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}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user