diff options
| author | Jim Wilson <wilson@cygnus.com> | 1999-03-26 20:50:16 +0000 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 1999-03-26 12:50:16 -0800 |
| commit | 2d490c9e5d6c47fffb395c10115aed5e4082ddbe (patch) | |
| tree | f8d38ec8e535d8e053bf2494ec0ac7f9ae953dc0 /gcc | |
| parent | 20b78b1cd46740ea58783ba06a68d12c335c065d (diff) | |
| download | gcc-2d490c9e5d6c47fffb395c10115aed5e4082ddbe.zip gcc-2d490c9e5d6c47fffb395c10115aed5e4082ddbe.tar.gz gcc-2d490c9e5d6c47fffb395c10115aed5e4082ddbe.tar.bz2 | |
Fix vxworks --with-headers build failure.
* Makefile.in (stmp-fixinc): Use tooldir instead of gcc_tooldir.
From-SVN: r26003
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/Makefile.in | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1900e94..1935236 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 26 20:41:46 1999 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (stmp-fixinc): Use tooldir instead of gcc_tooldir. + Fri Mar 26 16:02:37 1999 Nick Clifton <nickc@cygnus.com> * configure.in (arm-*-vxworks*): Just include arm/vxarm.h diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 50128b9..59352a5 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2140,13 +2140,15 @@ stmp-fixinc: fixinc.sh gsyslimits.h cp $(srcdir)/gsyslimits.h include/syslimits.h; \ fi chmod a+r include/syslimits.h -# If $(SYSTEM_HEADER_DIR) is $(gcc_tooldir)/sys-include, and +# If $(SYSTEM_HEADER_DIR) is $(tooldir)/sys-include, and # that directory exists, then make sure that $(libsubdir) exists. -# This is because cpp is compiled to find $(gcc_tooldir)/include via +# This is because cpp is compiled to find $(tooldir)/include via # $(libsubdir)/$(unlibsubdir), which will only work if $(libsubdir) # exists. - if [ "$(SYSTEM_HEADER_DIR)" = "$(gcc_tooldir)/sys-include" ] \ - && [ -d $(gcc_tooldir)/sys-include ]; then \ +# We deliberately use tooldir instead of gcc_tooldir here. gcc_tooldir +# won't work because libsubdir doesn't exist yet. + if [ "$(SYSTEM_HEADER_DIR)" = "$(tooldir)/sys-include" ] \ + && [ -d $(tooldir)/sys-include ]; then \ if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; fi; \ if [ -d $(libdir)/gcc-lib ] ; then true ; else mkdir $(libdir)/gcc-lib; fi; \ if [ -d $(libdir)/gcc-lib/$(target_alias) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target_alias) ; fi; \ |