H

        * Makefile.in (stmp-fixinc): Do not install assert.h if not desired.
        * config/t-rtems: Do not install assert.h -- use newlib's.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23096 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e1b1413..fdf3ab2 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2045,9 +2045,12 @@ stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
              $(SHELL) $(srcdir)/$(FIXINCLUDES) include $$dir; \
            else true; fi; \
          done; \
-         rm -f include/assert.h; \
-         cp $(srcdir)/assert.h include/assert.h; \
-         chmod a+r include/assert.h; \
+         if [ x$(INSTALL_ASSERT_H) != x ] ; \
+         then \
+           rm -f include/assert.h; \
+           cp $(srcdir)/assert.h include/assert.h; \
+           chmod a+r include/assert.h; \
+         fi \
        else true; \
        fi
        rm -f include/syslimits.h

diff --git a/gcc/config/t-rtems b/gcc/config/t-rtems
index 25dd398..aa0ca66 100644 (file)
--- a/gcc/config/t-rtems
+++ b/gcc/config/t-rtems
@@ -1,2 +1,6 @@
 # RTEMS uses newlib which does not require prototype fixing
 STMP_FIXPROTO =
+
+# Don't install "assert.h" in gcc.  RTEMS uses the one in newlib.
+INSTALL_ASSERT_H =
+