diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-11-05 07:48:40 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-11-05 07:48:40 +0000 |
| commit | 600da319add0f80d72f604292dec360e1f30a76a (patch) | |
| tree | c6ce21c3aed1758f02c82f47de6c233d84d9cf72 /lib | |
| parent | 7efeac5c1824755ae108bf535f7f95146c6cf02e (diff) | |
| download | src-600da319add0f80d72f604292dec360e1f30a76a.tar.gz src-600da319add0f80d72f604292dec360e1f30a76a.zip | |
Simplify r325427
CROSSENV (in Makefile.inc1) sets CPUTYPE/MACHINE(_ARCH)? to the
TARGET*-relevant values when building the `libraries` target.
PR: 222925
Notes
Notes:
svn path=/projects/runtime-coverage/; revision=325428
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libclang_rt/Makefile.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index f1797685f816..92f7bdc8a466 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -3,13 +3,11 @@ .include <src.opts.mk> # NOTE: based on TARGET_ABI/TARGET_CPUTYPE, set in Makefile.inc1 . -.if defined(TARGET) && defined(TARGET_ARCH) -.if ${TARGET} == "arm" -.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == "" +.if ${MACHINE} == "arm" +.if ${MACHINE_ARCH:Marmv[67]*} != "" && ${CPUTYPE:M*soft*} == "" CRTARCH= armhf .endif .endif -.endif CRTARCH?= ${TARGET_CPUARCH:C/amd64/x86_64/} CRTSRC= ${SRCTOP}/contrib/compiler-rt |