From 3bc62f91f49adee45295debabc8b19e10986619f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 21 Oct 2001 00:08:22 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/Makefile.in | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 52eb093bcc7..29777fec7c4 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2001-10-19 H.J. Lu + + * Makefile.in ($(TARGETLIB)): Also generate pic/$(TARGETLIB) if + necessary. + 2001-10-17 DJ Delorie * argv.c, asprintf.c, choose-temp.c, concat.c, cplus-dem.c, diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index f5499029696..877e0a9279f 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -154,10 +154,17 @@ CONFIGURED_OFILES = asprintf.o atexit.o basename.o bcmp.o bcopy.o \ vsprintf.o waitpid.o $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) - -rm -f $(TARGETLIB) + -rm -f $(TARGETLIB) pic/$(TARGETLIB) $(AR) $(AR_FLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) + if [ x"$(PICFLAG)" != x ]; then \ + cd pic; \ + $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ + $(RANLIB) $(TARGETLIB); \ + cd ..; \ + else true; fi info: libiberty.info info-subdir install-info: install-info-subdir -- 2.30.2