diff options
| author | Ulrich Drepper <drepper@cygnus.com> | 1997-09-16 10:01:55 -0600 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1997-09-16 10:01:55 -0600 |
| commit | e693cc28bbfeb1c1728bec4392505d2eba2b1090 (patch) | |
| tree | 6f133200943f818cad1e94da16393eadfe8dd250 /libio/config | |
| parent | 610ce97e654a9f2ed5e103bddd936988c5768538 (diff) | |
| download | gcc-e693cc28bbfeb1c1728bec4392505d2eba2b1090.zip gcc-e693cc28bbfeb1c1728bec4392505d2eba2b1090.tar.gz gcc-e693cc28bbfeb1c1728bec4392505d2eba2b1090.tar.bz2 | |
Uli's libio/libstdc++ patches.
From-SVN: r15486
Diffstat (limited to 'libio/config')
| -rw-r--r-- | libio/config/linux.mt | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/libio/config/linux.mt b/libio/config/linux.mt index ffda172..4bb92b7 100644 --- a/libio/config/linux.mt +++ b/libio/config/linux.mt @@ -1,26 +1,30 @@ -# Since the Linux C library has libio, we have to be very careful. +# Use the libio which comes with the local libc. -# By default, we build libio and use it. If someone wants to not -# build it, let them go to extra work. The reason is that the user -# may want a newer, bug fixed libio, also on a linux 1.0.8 system -# things just won't build with the bottom section uncommented. +# That is where we keep the g++ header files. +gxx_includedir =$(prefix)/include/g++ # Comment this out to avoid including the stdio functions in libiostream.a: -LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) -LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stmp-stdio -LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` +# LIBIOSTREAM_OBJECTS = $(IO_OBJECTS) $(IOSTREAM_OBJECTS) $(STDIO_WRAP_OBJECTS) $(OSPRIM_OBJECTS) +# LIBIOSTREAM_DEP = $(LIBIOSTREAM_OBJECTS) stdio.list +# LIBIOSTREAM_USE = $(LIBIOSTREAM_OBJECTS) `cat stdio.list` # Comment the above and uncomment the below to use the code in the Linux libc: # We have _G_config.h in /usr/include. -# _G_CONFIG_H= +_G_CONFIG_H= + +# We must not see the libio.h file from this library. +LIBIO_INCLUDE= # We have those in libc.a. -# IO_OBJECTS= -# STDIO_WRAP_OBJECTS= -# OSPRIM_OBJECTS= +IO_OBJECTS= +STDIO_WRAP_OBJECTS= +OSPRIM_OBJECTS= # We have the rest in /usr/include. -# USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ -# indstream.h iomanip.h iostream.h istream.h ostream.h \ -# parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ -# streambuf.h strfile.h strstream.h +USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \ + indstream.h iomanip.h iostream.h istream.h ostream.h \ + parsestream.h pfstream.h procbuf.h stdiostream.h stream.h \ + streambuf.h strfile.h strstream.h + +# tell we want the mt-safe version +MT_CFLAGS = -D_IO_MTSAFE_IO |