aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gprof/ChangeLog7
-rw-r--r--gprof/Makefile.in3
-rwxr-xr-xgprof/configure8
-rw-r--r--gprof/configure.in7
4 files changed, 22 insertions, 3 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 78a3d05..98c23a8 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 22 17:12:30 1996 Ian Lance Taylor <ian@cygnus.com>
+
+ * configure.in: Set and substitute HLDENV.
+ * configure: Rebuild.
+ * Makefile.in (HLDENV): New variable.
+ (gprof): Use $(HLDENV).
+
Wed Aug 7 14:43:51 1996 Philippe De Muyter <phdm@info.ucl.ac.be>
* core.c (read_function_mappings): Cast xmalloc return.
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index c4507a3..a9bce7a 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -54,6 +54,7 @@ GEN_FILES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
CFLAGS=-g -DDEBUG
LDFLAGS=
HLDFLAGS = @HLDFLAGS@
+HLDENV = @HLDENV@
.c.o:
$(CC) -c $(CFLAGS) -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MY_TARGET).h\" $(TCFLAGS) $(HCFLAGS) $<
@@ -103,7 +104,7 @@ install: all
$(INSTALL_XFORM1) $(srcdir)/gprof.1 $(man1dir)/gprof.1
gprof: $(OBJS) $(LIBDEPS)
- $(CC) -o $(PROG) $(CFLAGS) $(HLDFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+ $(HLDENV) $(CC) -o $(PROG) $(CFLAGS) $(HLDFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
mostlyclean:
-rm -f *.o core gprof nohup.out \
diff --git a/gprof/configure b/gprof/configure
index e1aed82..d032cd0 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -894,6 +894,7 @@ esac
HLDFLAGS=
+HLDENV=
# If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then
case "${host}" in
@@ -908,9 +909,12 @@ if test "${shared}" = "true"; then
*-*-linux*)
HLDFLAGS='-Wl,-rpath,$(libdir)'
;;
- *-*-sysv4* | *-*-solaris*)
+ *-*-solaris*)
HLDFLAGS='-R $(libdir)'
;;
+ *-*-sysv4*)
+ HLDENV='if test -z "$${LD_RUN_PATH}"; then LD_RUN_PATH=$(libdir); else LD_RUN_PATH=$${LD_RUN_PATH}:$(libdir); fi; export LD_RUN_PATH;'
+ ;;
esac
fi
@@ -937,6 +941,7 @@ case "${host}" in
esac
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -1087,6 +1092,7 @@ s%@build_os@%$build_os%g
s%@MY_TARGET@%$MY_TARGET%g
s%@BFDLIB@%$BFDLIB%g
s%@HLDFLAGS@%$HLDFLAGS%g
+s%@HLDENV@%$HLDENV%g
CEOF
EOF
diff --git a/gprof/configure.in b/gprof/configure.in
index 21409d5..82fde9c 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -60,6 +60,7 @@ esac
AC_SUBST(BFDLIB)
HLDFLAGS=
+HLDENV=
# If we have shared libraries, try to set rpath reasonably.
if test "${shared}" = "true"; then
case "${host}" in
@@ -74,9 +75,12 @@ if test "${shared}" = "true"; then
*-*-linux*)
HLDFLAGS='-Wl,-rpath,$(libdir)'
;;
- *-*-sysv4* | *-*-solaris*)
+ *-*-solaris*)
HLDFLAGS='-R $(libdir)'
;;
+ *-*-sysv4*)
+ HLDENV='if test -z "$${LD_RUN_PATH}"; then LD_RUN_PATH=$(libdir); else LD_RUN_PATH=$${LD_RUN_PATH}:$(libdir); fi; export LD_RUN_PATH;'
+ ;;
esac
fi
@@ -102,5 +106,6 @@ case "${host}" in
;;
esac
AC_SUBST(HLDFLAGS)
+AC_SUBST(HLDENV)
AC_OUTPUT(Makefile)