diff options
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | lib/clang/freebsd_cc_version.h | 3 | ||||
| -rw-r--r-- | lib/clang/include/clang/Basic/Version.inc | 2 | ||||
| -rw-r--r-- | lib/clang/libclangbasic/Makefile | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2503da3..39147a2 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -99,7 +99,7 @@ _expected_compiler_type= gcc .if ${_expected_compiler_type} == "clang" CROSS_COMPILER_FREEBSD_VERSION!= \ awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \ - ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown + ${SRCDIR}/lib/clang/freebsd_cc_version.h || echo unknown CROSS_COMPILER_VERSION!= \ awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \ ${SRCDIR}/lib/clang/include/clang/Basic/Version.inc || echo unknown 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 |
