diff options
| author | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-16 02:53:47 +0000 |
|---|---|---|
| committer | dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-05-16 02:53:47 +0000 |
| commit | 85096a02fc3d3232a81db27ba96948da13caef15 (patch) | |
| tree | 199ab0f34e0841640e5de4c4caf9392493da73d0 /libio | |
| parent | e390e838fd2aa9f8c0f0bfd7a38eb20de5bb2305 (diff) | |
| download | gcc-85096a02fc3d3232a81db27ba96948da13caef15.tar.gz | |
* config.shared: Change "pic" to depend on $(PICFLAG), not
on $(enable_shared).
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33920 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ChangeLog | 4 | ||||
| -rw-r--r-- | libio/config.shared | 17 |
2 files changed, 14 insertions, 7 deletions
diff --git a/libio/ChangeLog b/libio/ChangeLog index 6667a446f30..fdbdf06dd0e 100644 --- a/libio/ChangeLog +++ b/libio/ChangeLog @@ -1,3 +1,7 @@ +2000-05-15 David Edelsohn <edelsohn@gnu.org> + + * config.shared: Change "pic" to depend on $(PICFLAG), not + on $(enable_shared). 2000-05-11 Robert Lipe <robertlipe@usa.net> diff --git a/libio/config.shared b/libio/config.shared index 6cda566eb7b..0c319c118a0 100644 --- a/libio/config.shared +++ b/libio/config.shared @@ -267,23 +267,26 @@ echo >&2 '.SUFFIXES: .o .C .cc .c' echo >&2 'COMPILE.c = $(CC) -c $(XCFLAGS) $(CINCLUDES) $(MT_CFLAGS)' echo >&2 '.c.o:' if [ "${LIBDIR}" = "yes" ]; then -echo >&2 ' test x"$(enable_shared)" != xyes ||\' -echo >&2 ' $(COMPILE.c) $(PICFLAG) $< -o pic/$@' +echo >&2 ' if [ x"$(PICFLAG)" != x ]; then \' +echo >&2 ' $(COMPILE.c) $(PICFLAG) $< -o pic/$@; \' +echo >&2 ' else true; fi' fi echo >&2 ' $(COMPILE.c) $<' [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 ' @touch stamp' echo >&2 'COMPILE.cc = $(CXX) -c $(XCXXFLAGS) $(CXXINCLUDES) $(MT_CFLAGS)' echo >&2 '.C.o:' if [ "${LIBDIR}" = "yes" ]; then -echo >&2 ' test x"$(enable_shared)" != xyes ||\' -echo >&2 ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@' +echo >&2 ' if [ x"$(PICFLAG)" != x ]; then \' +echo >&2 ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@; \' +echo >&2 ' else true; fi' fi echo >&2 ' $(COMPILE.cc) $<' [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 ' @touch stamp' echo >&2 '.cc.o:' if [ "${LIBDIR}" = "yes" ]; then -echo >&2 ' test x"$(enable_shared)" != xyes || \' -echo >&2 ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@' +echo >&2 ' if [ x"$(PICFLAG)" != x ]; then \' +echo >&2 ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@; \' +echo >&2 ' else true; fi' fi echo >&2 ' $(COMPILE.cc) $<' [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 ' @touch stamp' @@ -299,7 +302,7 @@ fi if [ "${LIBDIR}" = "yes" ]; then echo >&2 '' echo >&2 'stamp-picdir:' - echo >&2 ' if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \' + echo >&2 ' if [ x"$(PICFLAG)" != x ] && [ ! -d pic ]; then \' echo >&2 ' mkdir pic; \' echo >&2 ' else true; fi' echo >&2 ' touch stamp-picdir' |