diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2001-02-06 06:36:08 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2001-02-06 06:36:08 +0000 |
| commit | 3e897b66f724ecaa3cc9f870b30dd5ff5b3ae49a (patch) | |
| tree | 4766082b53343b332fc0dae0fbe39e415fbdffdf | |
| parent | 43ba4a5894f9b028112695f32df268c5e5b3b398 (diff) | |
| download | gcc-3e897b66f724ecaa3cc9f870b30dd5ff5b3ae49a.zip gcc-3e897b66f724ecaa3cc9f870b30dd5ff5b3ae49a.tar.gz gcc-3e897b66f724ecaa3cc9f870b30dd5ff5b3ae49a.tar.bz2 | |
Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Change to target subdir of gcc_gxx_include_dir.
2001-02-05 Benjamin Kosnik <bkoz@redhat.com>
* Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Change to target
subdir of gcc_gxx_include_dir.
(gcc_gxx_target_include_dir): Remove.
From-SVN: r39480
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a546132..547f50f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-02-05 Benjamin Kosnik <bkoz@redhat.com> + + * Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Change to target + subdir of gcc_gxx_include_dir. + (gcc_gxx_target_include_dir): Remove. + 2001-02-05 Jeffrey Oldham <oldham@codesourcery.com> * dwarf2out.c: Revise DWARF2 Abbreviation Glossary comments. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index cc78c6c..0786f83 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -318,8 +318,6 @@ slibdir = @slibdir@ 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 in which the compiler finds target-dependent g++ includes. -gcc_gxx_target_include_dir = $(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/$(target_alias)/include/@libstdcxx_incdir@ # Directory to search for site-specific includes. includedir = $(local_prefix)/include # assertdir is overridden in cross-make. @@ -1910,7 +1908,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_gxx_target_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" |