Skip to content

Commit 91c5079

Browse files
committed
Fix a build error on Tru64.
1 parent 9b958b9 commit 91c5079

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

ChangeLog

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1+
2003-05-18 Bruno Haible <[email protected]>
2+
3+
* Version 1.9 released.
4+
5+
2003-05-18 Bruno Haible <[email protected]>
6+
7+
* lib/Makefile.in (libiconv_plug_osf.so): Avoid using LIBTOOL_LINK.
8+
19
2003-05-18 Bruno Haible <[email protected]>
210

311
* lib/Makefile.msvc (DEBUGFLAGS): New variable.
412
(iconv.lib): Use it.
513
* src/Makefile.msvc (DEBUGFLAGS): New variable.
614
* tests/Makefile.msvc (DEBUGFLAGS): New variable.
715

8-
2003-05-17 Bruno Haible <[email protected]>
9-
10-
* Version 1.9 released.
11-
1216
2003-05-17 Bruno Haible <[email protected]>
1317

1418
* src/Makefile.msvc (libdir, datadir, localedir): New variables.

lib/Makefile.in

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,12 @@ libiconv_plug_osf.so : $(SOURCES)
8080
if test -n "@GCC@"; then \
8181
$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -fPIC -DPIC -DLIBICONV_PLUG $(SOURCES) -shared -o libiconv_plug_osf.so; \
8282
else \
83-
$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG $(SOURCES) -c -o iconv_plug.o; \
84-
/bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so iconv_plug.o; \
83+
mkdir objects; \
84+
for f in $(SOURCES); do \
85+
$(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) $(DEFS) -DPIC -DLIBICONV_PLUG -c $$f -o objects/`basename $$f | sed -e 's,\.c$$,.o,'`; \
86+
done; \
87+
/bin/ld -shared -expect_unresolved \* -o libiconv_plug_osf.so objects/*.o; \
88+
rm -rf objects; \
8589
fi
8690

8791
iconv.lo : $(srcdir)/iconv.c $(srcdir)/converters.h $(srcdir)/encodings.def $(srcdir)/encodings_aix.def $(srcdir)/encodings_osf1.def $(srcdir)/encodings_dos.def $(srcdir)/encodings_local.def $(srcdir)/aliases.h $(srcdir)/aliases_aix.h $(srcdir)/aliases_osf1.h $(srcdir)/aliases_dos.h $(srcdir)/flags.h

0 commit comments

Comments
 (0)