From c3cfc9962b883a1da7082735f77a9c4b4e4ffdd8 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 7 Sep 2016 20:56:20 +0200 Subject: Allow asan, msan and ubsan to be configured with shared libraries The background story is that util/shlib_wrap.sh was setting LD_PRELOAD or similar platform dependent variables, just in case the shared libraries were built with -rpath. Unfortunately, this doesn't work too well with asan, msan or ubsan. So, the solution is to forbid the combination of shared libraries, -rpath and any of the sanity analyzers we can configure. This changes util/shlib_wrap.sh so it only contains the code that sets LD_PRELOAD when -rpath has been used when configuring. Reviewed-by: Rich Salz (cherry picked from commit 342a1a23793cb99921abeabe882adf8652ba715d) --- Configurations/unix-Makefile.tmpl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Configurations') diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 1392295607..d486d9e2ab 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -775,18 +775,14 @@ dist: # Helper targets ##################################################### -link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/shlib_wrap.sh +link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/opensslwrap.sh: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ mkdir -p "$(BLDDIR)/util"; \ ln -sf "../$(SRCDIR)/util/opensslwrap.sh" "$(BLDDIR)/util"; \ fi -$(BLDDIR)/util/shlib_wrap.sh: configdata.pm - @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ - mkdir -p "$(BLDDIR)/util"; \ - ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \ - fi + FORCE: # Building targets ################################################### -- cgit v1.2.3