diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2017-12-02 17:39:04 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2017-12-02 17:39:04 +0000 |
commit | 133637d5912a7234f13618ee2021c4b20baa886d (patch) | |
tree | f05e47a19f7402bf198f32290dc40cd01403463a /lib/libclang_rt | |
parent | 7abc09cddb410487e6a1c9d59f3c01d5ff805be6 (diff) | |
download | src-133637d5912a7234f13618ee2021c4b20baa886d.tar.gz src-133637d5912a7234f13618ee2021c4b20baa886d.zip |
Make the assignment of CRTARCH conditional, even in the armhf case, and
slightly rework the .if statement. While here, fix a minor typo.
Notes
Notes:
svn path=/head/; revision=326475
Diffstat (limited to 'lib/libclang_rt')
-rw-r--r-- | lib/libclang_rt/Makefile.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 0f08d8054505..39b4e661bd67 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -3,12 +3,13 @@ .include <bsd.compiler.mk> # armv[67] is a bit special since we allow a soft-floating version via -# CPUTYPE matching *soft*. This variant is may not actually work though. +# CPUTYPE matching *soft*. This variant may not actually work though. .if ${MACHINE_ARCH:Marmv[67]*} != "" && \ (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") -CRTARCH= armhf -.endif +CRTARCH?= armhf +.else CRTARCH?= ${MACHINE_CPUARCH:C/amd64/x86_64/} +.endif CRTSRC= ${SRCTOP}/contrib/compiler-rt .PATH: ${CRTSRC}/lib |