Date: Thu, 12 Oct 2017 18:16:51 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451923 - head/devel/llvm50 Message-ID: <201710121816.v9CIGp5v024845@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Thu Oct 12 18:16:50 2017 New Revision: 451923 URL: https://svnweb.freebsd.org/changeset/ports/451923 Log: - add support for ARMv7 - for ARMv[67], use correct API when building CONFIGURE_TARGET PR: 219779 Submitted by: Sylvain Garrigues <sylvain@sylvaingarrigues.com> Modified: head/devel/llvm50/Makefile Modified: head/devel/llvm50/Makefile ============================================================================== --- head/devel/llvm50/Makefile Thu Oct 12 17:56:08 2017 (r451922) +++ head/devel/llvm50/Makefile Thu Oct 12 18:16:50 2017 (r451923) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 5.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -194,8 +194,21 @@ EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTR .include <bsd.port.options.mk> # keep in sync with /usr/src/lib/clang/clang.build.mk -CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL} +# ----------- start of sync block ------------------ +# Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. +# arm (for armv4 and armv5 CPUs) always uses the soft float ABI. +# For all other targets, we stick with 'unknown'. +.if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") +TARGET_ABI= -gnueabihf +.elif ${ARCH:Marm*} +TARGET_ABI= -gnueabi +.else +TARGET_ABI= +.endif +CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI} +# ----------- end of sync block -------------------- + .if ${PORT_OPTIONS:MCLANG} COMMANDS+= c-index-test \ clang \ @@ -323,7 +336,7 @@ PORTDOCS+= lld CXXFLAGS+= -D_GLIBCXX_USE_C99 .endif -.if ${ARCH} == "armv6" +.if ${ARCH} == "armv6" || ${ARCH} == "armv7" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710121816.v9CIGp5v024845>