On 8/23/2018 11:19 AM, Alex Richardson wrote:
> Author: arichardson
> Date: Thu Aug 23 18:19:10 2018
> New Revision: 338268
> URL: https://svnweb.freebsd.org/changeset/base/338268
> 
> Log:
>   Fix non-FreeBSD host lib32 build for TARGET=amd64
>   
>   When building on non-FreeBSD systems we need to pass an explicit target
>   triple to clang otherwise it will attempt to build with the host triple.
>   This also has advantages when building on a FreeBSD host: we now tell
>   clang that we are targeting at least FreeBSD 12.0 instead of an older
>   version so it can enable newer features.
>   
>   Reviewed By:        brooks (mentor)
>   Approved By:        jhb (mentor)
>   Differential Revision: https://reviews.freebsd.org/D16842
> 
> Modified:
>   head/Makefile.libcompat
> 
> Modified: head/Makefile.libcompat
> ==============================================================================
> --- head/Makefile.libcompat   Thu Aug 23 18:19:01 2018        (r338267)
> +++ head/Makefile.libcompat   Thu Aug 23 18:19:10 2018        (r338268)
> @@ -14,6 +14,11 @@ LIB32CPUFLAGS=     -march=i686 -mmmx -msse -msse2
>  .else
>  LIB32CPUFLAGS=       -march=${TARGET_CPUTYPE}
>  .endif
> +.if ${WANT_COMPILER_TYPE} == gcc || \
> +    (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
> +.else
> +LIB32CPUFLAGS+=      -target x86_64-unknown-freebsd12.0

This can be ${TARGET_TRIPLE}, no?
It also seems like it should be in the LIBSOFT flags too; via
LIBCOMPATCFLAGS.

> +.endif
>  LIB32CPUFLAGS+=      -m32
>  LIB32WMAKEENV=       MACHINE=i386 MACHINE_ARCH=i386 \
>               MACHINE_CPU="i686 mmx sse sse2"
> 


-- 
Regards,
Bryan Drewery

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to