diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-27 16:56:46 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2018-06-27 16:56:46 +0000 |
| commit | f272627fcd3720f6f5fd3deb4ffb8f978516688a (patch) | |
| tree | 968f1082a69fef69f76b378bf925e204998f4b62 /lib | |
| parent | 5641c23fa770b56b7f0f2e79df22cd6bbb8c4972 (diff) | |
| download | src-test2-f272627fcd3720f6f5fd3deb4ffb8f978516688a.tar.gz src-test2-f272627fcd3720f6f5fd3deb4ffb8f978516688a.zip | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/tests/ssp/Makefile | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 5e0cca1fadf5..54dceb0eceb7 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -1,9 +1,5 @@ # $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= @@ -35,21 +31,16 @@ PROGS+= h_memset # probably needs to be fixed as it's currently hardcoded. # # sanitizer is not tested or supported for ARM right now. sbruno -.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 --- - +.if ${COMPILER_TYPE} == "clang" && !defined(_SKIP_BUILD) && \ + (!defined(_RECURSING_PROGS) || ${PROG} == "h_raw") +.if !defined(_CLANG_RESOURCE_DIR) +_CLANG_RESOURCE_DIR!= ${CC:N${CCACHE_BIN}} -print-resource-dir +.export _CLANG_RESOURCE_DIR .endif +_libclang_rt_arch= ${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/} +_libclang_rt_ubsan= ${_CLANG_RESOURCE_DIR}/lib/freebsd/libclang_rt.ubsan_standalone-${_libclang_rt_arch}.a +.if exists(${_libclang_rt_ubsan}) +PROGS+= h_raw .endif .endif PROGS+= h_read |