Date: Tue, 28 Jun 2016 07:47:42 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302246 - head/lib/libc/tests/ssp Message-ID: <201606280747.u5S7lgMq051544@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Jun 28 07:47:42 2016 New Revision: 302246 URL: https://svnweb.freebsd.org/changeset/base/302246 Log: This commit addresses regression introduceded in r302177 (WITH_SYSTEM_COMPILER: Enable by default) and it's prerequisite: r300354, caused i386 builds to fail when cross-built on an amd64 host. Reviewed by: bdrewery, delphij, gjb Approved by: re (gjb) Modified: head/lib/libc/tests/ssp/Makefile Modified: head/lib/libc/tests/ssp/Makefile ============================================================================== --- head/lib/libc/tests/ssp/Makefile Tue Jun 28 07:11:27 2016 (r302245) +++ head/lib/libc/tests/ssp/Makefile Tue Jun 28 07:47:42 2016 (r302246) @@ -1,5 +1,9 @@ # $FreeBSD$ +# XXX This is a workaround to allow i386 to cross-compile on an amd64 host. +.include <host-target.mk> +# XXX --- + .include <bsd.own.mk> NO_WERROR= @@ -34,7 +38,17 @@ PROGS+= h_memset .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${COMPILER_TYPE} == "clang" && ${MK_TOOLCHAIN} == "yes" .if ${COMPILER_VERSION} < 30500 || 30700 <= ${COMPILER_VERSION} + +# XXX This is a workaround to allow i386 to cross-compile on an amd64 host. +.if ${MACHINE_CPUARCH} == ${_HOST_ARCH} +# XXX --- + PROGS+= h_raw + +# XXX This is a workaround to allow i386 to cross-compile on an amd64 host. +.endif +# XXX --- + .endif .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606280747.u5S7lgMq051544>