From d5946a44a2d8e50525b58d301bdfe35eee3f8405 Mon Sep 17 00:00:00 2001 From: Alberto Bertogli Date: Thu, 2 Jul 2009 21:29:48 -0300 Subject: [PATCH 08/25] preload: Only link against libdl when available Signed-off-by: Alberto Bertogli --- preload/posix/Makefile | 6 +++++- preload/run/Makefile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/preload/posix/Makefile b/preload/posix/Makefile index 34664e2..0713dff 100644 --- a/preload/posix/Makefile +++ b/preload/posix/Makefile @@ -49,8 +49,12 @@ $(GEN_OBJS): $(GEN_C) .c.o: $(NICE_CC) $(ALL_CFLAGS) -c $< -o $@ +# some platforms do not have libdl, we only use it if available +NEED_LIBDL := $(shell ld -o dlcheck.so -shared -ldl 2>/dev/null && echo -ldl; \ + rm -f dlcheck.so) + fiu_posix_preload.so: $(OBJS) - $(NICE_CC) $(ALL_CFLAGS) -shared -fPIC $(OBJS) -lfiu -ldl \ + $(NICE_CC) $(ALL_CFLAGS) -shared -fPIC $(OBJS) -lfiu $(NEED_LIBDL) \ -o fiu_posix_preload.so # this should only be needed when building the function list and not the diff --git a/preload/run/Makefile b/preload/run/Makefile index 1cc160d..366cee1 100644 --- a/preload/run/Makefile +++ b/preload/run/Makefile @@ -35,8 +35,12 @@ all: fiu_run_preload.so fiu-run .c.o: $(NICE_CC) $(ALL_CFLAGS) -c $< -o $@ +# some platforms do not have libdl, we only use it if available +NEED_LIBDL := $(shell ld -o dlcheck.so -shared -ldl 2>/dev/null && echo -ldl; \ + rm -f dlcheck.so) + fiu_run_preload.so: $(OBJS) - $(NICE_CC) $(ALL_CFLAGS) -shared -fPIC $(OBJS) -lfiu -ldl \ + $(NICE_CC) $(ALL_CFLAGS) -shared -fPIC $(OBJS) -lfiu $(NEED_LIBDL) \ -o fiu_run_preload.so fiu-run: fiu-run.in -- 1.6.2.2.646.gb214