Date: Sat, 2 Dec 2017 17:39:04 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326475 - head/lib/libclang_rt Message-ID: <201712021739.vB2Hd4or072618@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Dec 2 17:39:04 2017 New Revision: 326475 URL: https://svnweb.freebsd.org/changeset/base/326475 Log: Make the assignment of CRTARCH conditional, even in the armhf case, and slightly rework the .if statement. While here, fix a minor typo. Modified: head/lib/libclang_rt/Makefile.inc Modified: head/lib/libclang_rt/Makefile.inc ============================================================================== --- head/lib/libclang_rt/Makefile.inc Sat Dec 2 17:22:55 2017 (r326474) +++ head/lib/libclang_rt/Makefile.inc Sat Dec 2 17:39:04 2017 (r326475) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712021739.vB2Hd4or072618>