diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2000-12-21 07:19:41 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-12-21 07:19:41 +0000 |
| commit | 9d680205ed84aca8c9a8ce12fd01fbe110d7dc3f (patch) | |
| tree | f70616fc02fb801d9d6078703ff40bb6a95fa7ec /gcc | |
| parent | 01c70ab016d52a0b7e823d690e932f1ba1a8c3d3 (diff) | |
| download | gcc-9d680205ed84aca8c9a8ce12fd01fbe110d7dc3f.zip gcc-9d680205ed84aca8c9a8ce12fd01fbe110d7dc3f.tar.gz gcc-9d680205ed84aca8c9a8ce12fd01fbe110d7dc3f.tar.bz2 | |
Makefile.in (gcc_gxx_target_include_dir): Use instead of build_tooldir and libstdcxx_incdir.
2000-12-20 Benjamin Kosnik <bkoz@redhat.com>
* Makefile.in (gcc_gxx_target_include_dir): Use instead of
build_tooldir and libstdcxx_incdir.
From-SVN: r38412
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce228cf..678e2c8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-12-20 Benjamin Kosnik <bkoz@redhat.com> + + * Makefile.in (gcc_gxx_target_include_dir): Use instead of + build_tooldir and libstdcxx_incdir. + 2000-12-20 Robert Lipe <robertlipe@usa.net> * haifa-sched.c (schedule_block): Provide empty source statement diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 1f6e925..fec7c15 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -316,8 +316,8 @@ gcc_tooldir = @gcc_tooldir@ build_tooldir = $(exec_prefix)/$(target_alias) # Directory in which the compiler finds target-independent g++ includes. gcc_gxx_include_dir = @gcc_gxx_include_dir@ -# Directory where the compiler finds target-dependent files. -libstdcxx_incdir = @libstdcxx_incdir@ +# Directory in which the compiler finds target-dependent g++ includes. +gcc_gxx_target_include_dir = $(build_tooldir)/include/@libstdcxx_incdir@ # Directory to search for site-specific includes. includedir = $(local_prefix)/include # assertdir is overridden in cross-make. @@ -1871,7 +1871,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=\"$(build_tooldir)/include/$(libstdcxx_incdir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_target_include_dir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" |