diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-11-07 05:02:36 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-11-07 05:02:36 +0000 |
| commit | c03bb93303de56c339b6ab6acc220697a1aa5ed6 (patch) | |
| tree | 590a0d7cf60e9ba666d6efbbc6afac6184c31e6b /lib/libclang_rt | |
| parent | 5252514fb490a2a46ecb65dd65f4dcc1d78615ba (diff) | |
| download | src-test2-c03bb93303de56c339b6ab6acc220697a1aa5ed6.tar.gz src-test2-c03bb93303de56c339b6ab6acc220697a1aa5ed6.zip | |
Handle arm/armv[67] hosted/targeted builds gracefully
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>
Notes
Notes:
svn path=/head/; revision=325502
Diffstat (limited to 'lib/libclang_rt')
| -rw-r--r-- | lib/libclang_rt/Makefile.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 3eb7fac66ff7..1723ba5b9964 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -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 |