Attachment 187075 Details for Bug 219779 – Updated patch

[patch] Updated patch

llvm40.diff (text/plain), 1.66 KB, created by Michal Meloun on 2017-10-11 08:23:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Meloun

Created: 2017-10-11 08:23:38 UTC

Size: 1.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 451729)
>+++ Makefile	(working copy)
>@@ -40,6 +40,8 @@
> 
> CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
> CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
>+CMAKE_ARGS+=    -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
>+CMAKE_ARGS+=    -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
> # Following commit https://github.com/kitware/cmake/commit/956054
> # we need to either change the whole man-shuffle below, or simply
> # redefine CMAKE_INSTALL_MANDIR
>@@ -184,9 +186,22 @@
> 
> .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}
>+# keep in sync with /usr/src/lib/clang/llvm.build.mk
>+# ----------- 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 \
>@@ -308,7 +323,7 @@
> 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

Actions: View | Diff

Attachments on bug 219779: 187046 | 187075 | 187108