diff options
| author | H.J. Lu <hjl@gnu.org> | 2000-07-26 06:49:33 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-07-26 06:49:33 +0000 |
| commit | 44fc6a025a220f9db7ac0c44beba3b922b04588e (patch) | |
| tree | 474e7c6137e4c26b10ee8fc92603cb1c5ce49b52 | |
| parent | ad88bb8b2ced823f0dd8aafce8ef0cc40079f67a (diff) | |
| download | gcc-44fc6a025a220f9db7ac0c44beba3b922b04588e.zip gcc-44fc6a025a220f9db7ac0c44beba3b922b04588e.tar.gz gcc-44fc6a025a220f9db7ac0c44beba3b922b04588e.tar.bz2 | |
Makefile.am (LIBIO_INCLUDES): Set to -I$(top_srcdir)/libio even if GLIBCPP_NEED_LIBIO is false.
2000-07-24 H.J. Lu <hjl@gnu.org>
* src/Makefile.am (LIBIO_INCLUDES): Set to -I$(top_srcdir)/libio
even if GLIBCPP_NEED_LIBIO is false. The installed glibc header
files don't include private libio header files needed by
libstdc++ v3.
* src/Makefile.in: Rebuild.
From-SVN: r35261
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 02a0fa9..0c752e4 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -64,7 +64,7 @@ if GLIBCPP_NEED_LIBIO LIBIO_INCLUDES = \ -I$(top_builddir)/libio -I$(top_srcdir)/libio else -LIBIO_INCLUDES = +LIBIO_INCLUDES = -I$(top_srcdir)/libio endif if GLIBCPP_USE_CSHADOW @@ -98,7 +98,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ # rules automake generates would be used. We cannot allow CXX to be used # in libtool since this would add -lstdc++ to the link line which of # course is impossible. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --mode=link "$(CC)" -Wl,-O1 @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ headers = \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 73d42da..ac85182 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -137,7 +137,7 @@ AM_CXXFLAGS = \ TOPLEVEL_INCLUDES = -I$(includedir) @GLIBCPP_NEED_LIBIO_TRUE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_TRUE@\ @GLIBCPP_NEED_LIBIO_TRUE@ -I$(top_builddir)/libio -I$(top_srcdir)/libio -@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = +@GLIBCPP_NEED_LIBIO_FALSE@LIBIO_INCLUDES = @GLIBCPP_NEED_LIBIO_FALSE@-I$(top_srcdir)/libio #CSHADOW_INCLUDES = \ # @CSHADOWFLAGS@ -I$(top_srcdir)/shadow -I$(top_builddir)/cshadow @GLIBCPP_USE_CSHADOW_TRUE@CSHADOW_INCLUDES = @@ -169,7 +169,7 @@ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) \ # rules automake generates would be used. We cannot allow CXX to be used # in libtool since this would add -lstdc++ to the link line which of # course is impossible. -CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ +CXXLINK = $(LIBTOOL) --mode=link "$(CC)" -Wl,-O1 @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ headers = \ bits/cpp_type_traits.h \ |