svn commit: r367062 - stable/11/lib/libc/tests/ssp

[Brooks Davis]

Author: brooks
Date: Mon Oct 26 17:50:34 2020
New Revision: 367062
URL: https://svnweb.freebsd.org/changeset/base/367062

Log:
  MFC r366981:
  
  Only use ASAN when using the in-tree compiler
  
  When building FreeBSD 11 on a FreeBSD 12 system with
  CROSS_TOOLCHAIN=llvm10 we end up trying to link against the packaged
  version of the sanitizer library.  This resulted in a requirement for
  getentropy(3) which is not present in FreeBSD 11.
  
  Reviewed by:	emaste
  Differential Revision:	https://reviews.freebsd.org/D26903

Modified:
  stable/11/lib/libc/tests/ssp/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libc/tests/ssp/Makefile
==============================================================================
--- stable/11/lib/libc/tests/ssp/Makefile	Mon Oct 26 17:47:42 2020	(r367061)
+++ stable/11/lib/libc/tests/ssp/Makefile	Mon Oct 26 17:50:34 2020	(r367062)
@@ -6,7 +6,9 @@ NO_WERROR=
 WARNS?=	2
 
 CFLAGS.h_raw+=	-fstack-protector-all -Wstack-protector
-.if ${COMPILER_TYPE} == "clang"
+.if ${COMPILER_TYPE} == "clang" && ${CC} == "cc"
+# Only use -fsanitize=bounds when using the in-tree compiler.  Otherwise
+# we may link to a sanitizer library targeted at a newer kernel/libc.
 CFLAGS.h_raw+=	-fsanitize=bounds
 .elif ${COMPILER_TYPE} == "gcc"
 CFLAGS.h_raw+=	--param ssp-buffer-size=1