diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-12-20 06:50:19 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-12-20 06:50:19 +0000 |
| commit | 1eddfef1b07c7c57df7b4d9eb00d9e7d2f6c2924 (patch) | |
| tree | 726c17339b5b670be1eb6cba781c6e723a86af5a | |
| parent | 205c6f170960eebb23a90a2acc165b129a7b304d (diff) | |
| download | gcc-1eddfef1b07c7c57df7b4d9eb00d9e7d2f6c2924.zip gcc-1eddfef1b07c7c57df7b4d9eb00d9e7d2f6c2924.tar.gz gcc-1eddfef1b07c7c57df7b4d9eb00d9e7d2f6c2924.tar.bz2 | |
Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir instead of gcc_tooldir.
2000-12-19 Benjamin Kosnik <bkoz@redhat.com>
* Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir
instead of gcc_tooldir.
From-SVN: r38389
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 773fd88e..24e0508 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-12-19 Benjamin Kosnik <bkoz@redhat.com> + + * Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir + instead of gcc_tooldir. + 2000-12-19 John David Anglin <dave@hiauly1.hia.nrc.ca> * system.h (getopt): Update prototype to match include/getopt.h. @@ -131,6 +136,7 @@ Tue Dec 19 00:37:08 2000 J"orn Rennecke <amylaar@redhat.com> (cpp_push_buffer): Don't generate a callback. Clear sysp. (cpp_pop_buffer): Clean up logic. +>>>>>>> 1.8655 2000-12-18 Benjamin Kosnik <bkoz@redhat.com> * configure.in (gcc_gxx_include_dir): Simplify. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 90db073..eadd5c4 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1868,7 +1868,7 @@ intl.all intl.install intl.uninstall \ PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include/$(libstdcxx_incdir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(build_tooldir)/include/$(libstdcxx_incdir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" |