diff options
author | John Baldwin <jhb@FreeBSD.org> | 2018-08-03 18:52:51 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2018-08-03 18:52:51 +0000 |
commit | 52f9bacb0e3933d924fa14a045026dbb0e005edc (patch) | |
tree | 46c35b83b1ba5fbdfb0a39743b4f734c81b09903 /Makefile.libcompat | |
parent | 2e62782dac95dc946eab90cf433f4d66ca0b39a3 (diff) | |
download | src-52f9bacb0e3933d924fa14a045026dbb0e005edc.tar.gz src-52f9bacb0e3933d924fa14a045026dbb0e005edc.zip |
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.
Reviewed by: bdrewery, dim
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D16574
Notes
Notes:
svn path=/head/; revision=337270
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r-- | Makefile.libcompat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index d038e4f42162..c2c729fdcfe1 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -126,7 +126,7 @@ LIBCOMPATWMAKE+= ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \ MAKEOBJDIRPREFIX= \ MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ - MK_TOOLCHAIN=no ${IMAKE_INSTALL} \ + ${IMAKE_INSTALL} \ -DLIBRARIES_ONLY _LC_LIBDIRS.yes= lib |