From 788d26643d95ac84987484d5ab4c6e76e6265a6c Mon Sep 17 00:00:00 2001 From: dim Date: Fri, 3 Jun 2016 16:17:36 +0000 Subject: For clang, move the definition of FREEBSD_CC_VERSION into its own header file, lib/clang/freebsd_cc_version.h, instead of reusing Version.inc. The header is only included from one .cpp file in the clang tree. This minimizes the number of .cpp files that need to be rebuilt if the version is bumped. Discussed with: bdrewery --- lib/clang/freebsd_cc_version.h | 3 +++ lib/clang/include/clang/Basic/Version.inc | 2 -- lib/clang/libclangbasic/Makefile | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 lib/clang/freebsd_cc_version.h (limited to 'lib/clang') diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h new file mode 100644 index 0000000..0f13792 --- /dev/null +++ b/lib/clang/freebsd_cc_version.h @@ -0,0 +1,3 @@ +/* $FreeBSD$ */ + +#define FREEBSD_CC_VERSION 1100004 diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 72c5bed..94dc282 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -8,5 +8,3 @@ #define CLANG_VENDOR "FreeBSD " #define SVN_REVISION "262564" - -#define FREEBSD_CC_VERSION 1100004U diff --git a/lib/clang/libclangbasic/Makefile b/lib/clang/libclangbasic/Makefile index 028fcdb..cfa2049 100644 --- a/lib/clang/libclangbasic/Makefile +++ b/lib/clang/libclangbasic/Makefile @@ -50,3 +50,6 @@ TGHDRS= AttrHasAttributeImpl \ # XX: work around GCC bug 67888 CFLAGS.gcc += -fpermissive + +# Ensure FREEBSD_CC_VERSION is defined for Targets.cpp +CFLAGS.Targets.cpp+= -include ../freebsd_cc_version.h -- cgit v1.1