From ff1abf70d2d485d5abc1a6faa71495c2f7289c27 Mon Sep 17 00:00:00 2001 From: law Date: Fri, 6 Feb 1998 00:33:49 +0000 Subject: [PATCH] * Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG. (.c.o): Check value of enable_shared, not PICFLAG. (stamp-picdir): Dito. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@17681 138bc75d-0d04-0410-961f-82ee72b054a4 --- libiberty/ChangeLog | 6 ++++++ libiberty/Makefile.in | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index ed428ab..64100fb 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 6 01:35:17 1998 Manfred Hollstein + + * Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG. + (.c.o): Check value of enable_shared, not PICFLAG. + (stamp-picdir): Dito. + Sun Feb 1 02:52:32 1998 Mike Stump * config.table (vxworks configs): Default to VxWorks 5.x, as that is diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 7afac09..71d02a3 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -111,7 +111,6 @@ FLAGS_TO_PASS = \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "LDFLAGS=$(LDFLAGS)" \ "LOADLIBES=$(LOADLIBES)" \ - "PICFLAG=$(PICFLAG)" \ "RANLIB=$(RANLIB)" \ "SHELL=$(SHELL)" @@ -132,7 +131,7 @@ INCDIR=$(srcdir)/$(MULTISRCTOP)../include COMPILE.c = $(CC) -c $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES) .c.o: - test -z "$(PICFLAG)" || \ + test x"$(enable_shared)" != xyes || \ $(COMPILE.c) $(PICFLAG) $< -o pic/$@ $(COMPILE.c) $< @@ -268,7 +267,7 @@ $(RULE2): $(REQUIRED_OFILES) $(HOST_OFILES) $(RANLIB) $(TARGETLIB) stamp-picdir: - if [ -n "$(PICFLAG)" ] && [ ! -d pic ]; then \ + if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \ mkdir pic; \ else true; fi touch stamp-picdir -- 2.7.4