Skip to content

Commit

Permalink
Handle arm/armv[67] hosted/targeted builds gracefully
Browse files Browse the repository at this point in the history
CPUTYPE (apparently) isn't defined in non-cross-builds, which caused
arm/armv[67] hosted/targeted builds to fail when evaluating CPUTYPE.

Add the :U modifier to CPUTYPE so it evaluates to "". This allows armv[67] to
get past the conditional successfully.

MFC after:	1 week
Reported by:	bob prohaska <fbsd@www.zefox.net>
  • Loading branch information
ngie-eign committed Nov 7, 2017
1 parent b6a74f7 commit a442dac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/libclang_rt/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.include <bsd.compiler.mk>

.if ${MACHINE} == "arm"
.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == ""
.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:U:M*soft*} == ""
CRTARCH= armhf
.endif
.endif
Expand Down

0 comments on commit a442dac

Please sign in to comment.