LLVM switched to three component point release version, so follow here.

This commit is contained in:
joerg 2014-11-14 15:56:12 +00:00
parent f88c0f1c84
commit f26a5b846f
2 changed files with 13 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.74 2014/08/10 17:34:19 joerg Exp $
# $NetBSD: Makefile.inc,v 1.75 2014/11/14 15:56:12 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
@ -17,8 +17,9 @@ LLVM_REVISION= ${COMMON_REVISION}
MCLINKER_REVISION= deeb2a77b4165827316f88e0a7ba4ba6b743a080
MCLINKER_ROOT= https://code.google.com/p/mclinker/
LLVM_VERSION= 3.6
CLANG_VERSION= 3.6
LLVM_VERSION= 3.6.0
CLANG_VERSION= 3.6.0
LLD_VERSION= 3.6.0
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
LLD_SRCDIR:= ${.PARSEDIR}/dist/lld
@ -63,7 +64,7 @@ LLVM_PLATFORM=${MACHINE_GNU_ARCH}--netbsd
LLVM_CONFIGURE_ARGS= \
--enable-targets=x86,powerpc,sparc,aarch64,arm,mips \
--with-c-include-dirs=/usr/include/clang-${CLANG_VERSION}:/usr/include \
--with-c-include-dirs=/usr/include/clang-${CLANG_VERSION:R}:/usr/include \
--disable-timestamps --prefix=/usr --sysconfdir=/etc/llvm \
--with-clang-srcdir=${CLANG_SRCDIR} \
--host=${LLVM_PLATFORM} --disable-compiler-version-checks \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.33 2014/09/06 01:02:21 joerg Exp $
# $NetBSD: Makefile,v 1.34 2014/11/14 15:56:12 joerg Exp $
.include <bsd.init.mk>
@ -43,17 +43,7 @@ INCS= altivec.h
.elif ${MACHINE_CPU} == "arm"
INCS= arm_acle.h
.endif
INCSDIR= /usr/include/clang-${CLANG_VERSION}
HEADER= \
float.h \
iso646.h \
limits.h \
stdarg.h \
stdbool.h \
stddef.h \
stdint.h \
tgmath.h
INCSDIR= /usr/include/clang-${CLANG_VERSION:R}
.PATH: ${LLVM_SRCDIR}/include/llvm/IR \
${CLANG_SRCDIR}/include/clang/AST \
@ -137,8 +127,8 @@ CLEANFILES+= clang/Basic/Version.inc
clang/Basic/Version.inc: ${LLVM_TOPLEVEL}/Makefile.inc
mkdir -p ${.TARGET:H}
printf '#define CLANG_VERSION ${CLANG_VERSION}\n' > ${.TARGET}.tmp
printf '#define CLANG_VERSION_MAJOR ${CLANG_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
printf '#define CLANG_VERSION_MINOR ${CLANG_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
printf '#define CLANG_VERSION_MAJOR ${CLANG_VERSION:R:R}\n' >> ${.TARGET}.tmp
printf '#define CLANG_VERSION_MINOR ${CLANG_VERSION:R:E}\n' >> ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.ifndef HOST_BUILD
@ -154,8 +144,8 @@ llvm/Config/config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm
> ${.TARGET}.tmp
printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
printf '#define PACKAGE_VERSION "${LLVM_VERSION} (trunk ${LLVM_REVISION})"\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:R:R}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:R:E}\n' >> ${.TARGET}.tmp
printf '#endif\n' >> ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
@ -166,8 +156,8 @@ llvm/Config/llvm-config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config
< ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in \
> ${.TARGET}.tmp
printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:R:R}\n' >> ${.TARGET}.tmp
printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:R:E}\n' >> ${.TARGET}.tmp
printf '#endif\n' >> ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}