diff options
| author | cy <cy@FreeBSD.org> | 2016-06-28 07:47:42 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2016-06-28 07:47:42 +0000 |
| commit | 96d5d9cf5de60ade43c054d2cae374fd3e7b8054 (patch) | |
| tree | b6c287dc56d79c93d96a3a8f45beaad0ac9c7480 /lib/libc | |
| parent | 8dad8cb1addbbb87b0b385c7ce4e687983d84461 (diff) | |
| download | FreeBSD-src-96d5d9cf5de60ade43c054d2cae374fd3e7b8054.zip FreeBSD-src-96d5d9cf5de60ade43c054d2cae374fd3e7b8054.tar.gz | |
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)
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/tests/ssp/Makefile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 2ac74aa..5e0cca1 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -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 |
