Makefile.in (deduced.h): Only run scan-types if $(SYSTEM_HEADER_DIR) exists.

        * Makefile.in (deduced.h): Only run scan-types if $(SYSTEM_HEADER_DIR)
        exists.
        * cross-make (SYSTEM_HEADER_DIR): Now $(tooldir)/sys-include.
Bring over from Cygnus sources.

From-SVN: r19898

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 963563503f934cf27e113ba6b4fc815e9ff2da7e..aa8aa7f2fffa0d2e81c3ad9d3bbe1a710a617638 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 19 22:31:20 1998  Jeffrey A Law  (law@cygnus.com)
+
+       * Makefile.in (deduced.h): Only run scan-types if $(SYSTEM_HEADER_DIR)
+       exists.
+       * cross-make (SYSTEM_HEADER_DIR): Now $(tooldir)/sys-include.
+
 Tue May 19 19:08:52 1998  Jim Wilson  <wilson@cygnus.com>
 
        * config/mips/mips.c (double_memory_operand): Accept any MEM during

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 9cfac12b50eaf82657da8bddfccfc1b9b1c4a1a5..5f92f4de2483540c6d9eae7cd97cd677642195ff 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2026,10 +2026,15 @@ stmp-fixinc: $(FIXINCLUDES) gsyslimits.h
 # Files related to the fixproto script.
 
 deduced.h: $(GCC_PASSES) $(srcdir)/scan-types.sh stmp-int-hdrs
-       CC="$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) -I. -I$(srcdir) -Iinclude -I${SYSTEM_HEADER_DIR}"; \
+       if [ -d $(SYSTEM_HEADER_DIR) ]; \
+       then \
+         CC="$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) -I. -I$(srcdir) -Iinclude -I${SYSTEM_HEADER_DIR}"; \
          export CC; \
-         $(SHELL) $(srcdir)/scan-types.sh "$(srcdir)" >tmp-deduced.h
-       mv tmp-deduced.h deduced.h
+         $(SHELL) $(srcdir)/scan-types.sh "$(srcdir)" >tmp-deduced.h; \
+         mv tmp-deduced.h deduced.h; \
+       else \
+         touch deduced.h; \
+       fi
 
 gen-protos: gen-protos.o scan.o cppalloc.o $(HOST_LIBDEPS)
        ${HOST_CC} $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \

diff --git a/gcc/cross-make b/gcc/cross-make
index 5e5a93fb44e57e3173717f63e6ba1fbeb465fb7b..810f5051a632404342626e58952ab07a3e03f75f 100644 (file)
--- a/gcc/cross-make
+++ b/gcc/cross-make
@@ -12,7 +12,8 @@ RANLIB = $(RANLIB_FOR_TARGET)
 RANLIB_TEST = $(RANLIB_TEST_FOR_TARGET)
 
 # Dir to search for system headers.  Normally /usr/include.
-SYSTEM_HEADER_DIR = $(tooldir)/include
+# Use CROSS_INCLUDE_DIR not TOOL_INCLUDE_DIR for other vendor's headers.
+SYSTEM_HEADER_DIR = $(tooldir)/sys-include
 
 # Don't try to compile the things we can't compile.
 ALL = all.cross