svn commit: r338833 - in stable/11: . lib/libclang_rt

[John Baldwin]

Author: jhb
Date: Thu Sep 20 16:43:58 2018
New Revision: 338833
URL: https://svnweb.freebsd.org/changeset/base/338833

Log:
  MFC 337270: Install the 32-bit compat sanitizer libraries.
  
  The lib32 build was already building the i386 version of
  the clang sanitizers (libclang_rt) but they were not being
  installed.  This enables the installation.
  
  MK_TOOLCHAIN=no was originally added to the install make
  environment to disable includes so that NO_INCS could be
  removed.  The MK_TOOLCHAIN in bsd.incs.mk was subsequently
  renamed to MK_INCLUDES, but bsd.lib.mk doesn't even include
  bsd.incs.mk when LIBRARIES_ONLY is defined which the install
  make environment for compat libs now defines.  However,
  setting MK_TOOLCHAIN=no forced MK_CLANG=no which disabled
  libclang_rt during the install32 phase.  Remove MK_TOOLCHAIN=no
  since LIBRARIES_ONLY is now sufficient.
  
  Since the libcompat environment overrides both LIBDIR and
  SHLIBDIR, libclang_rt/Makefile.inc has to set both variables
  to force the libraries to be installed to the location
  expected by the compiler.

Modified:
  stable/11/Makefile.libcompat
  stable/11/lib/libclang_rt/Makefile.inc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.libcompat
==============================================================================
--- stable/11/Makefile.libcompat	Thu Sep 20 16:37:50 2018	(r338832)
+++ stable/11/Makefile.libcompat	Thu Sep 20 16:43:58 2018	(r338833)
@@ -111,7 +111,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \
 LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MK_MAN=no MK_HTML=no
 LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
-			MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
+			${IMAKE_INSTALL} \
 			-DLIBRARIES_ONLY
 
 _LC_LIBDIRS.yes=		lib gnu/lib

Modified: stable/11/lib/libclang_rt/Makefile.inc
==============================================================================
--- stable/11/lib/libclang_rt/Makefile.inc	Thu Sep 20 16:37:50 2018	(r338832)
+++ stable/11/lib/libclang_rt/Makefile.inc	Thu Sep 20 16:43:58 2018	(r338833)
@@ -9,6 +9,7 @@ CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 CLANGDIR=	/usr/lib/clang/6.0.1
 LIBDIR=		${CLANGDIR}/lib/freebsd
+SHLIBDIR=	${LIBDIR}
 
 NO_PIC=
 MK_PROFILE=	no