diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-16 23:51:57 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-01-16 23:51:57 +0000 |
| commit | 33f5262e51b4de83e8dc8a191713ccd321d9e04f (patch) | |
| tree | c02c8ee252f4a3574baec98a4c45d395f83bc70c /gcc/Makefile.in | |
| parent | f4826e2540a5eb3ba5d085b27e33128341efeb70 (diff) | |
| download | gcc-33f5262e51b4de83e8dc8a191713ccd321d9e04f.tar.gz | |
Revert:
2016-12-02 Tadek Kijkowski <tkijkowski@gmail.com>
* Makefile.in (PREPROCESSOR_DEFINES): Add a level of indirection
for several include directories that may be relative to sysroot.
* config/i386/x-mingw32 (gplus_includedir): Define.
(gplus_tool_includedir, gplus_backward_include_dir): Likewise.
(native_system_includedir): Likewise.
* config/i386/mingw32.h (STANDARD_STARTFILE_PREFIX_1): Do not
override if TARGET_SYSTEM_ROOT is defined.
(NATIVE_SYSTEM_HEADER_DIR): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244510 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c53c78a2f03..59fe4aa2836 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -675,15 +675,6 @@ objext = .o exeext = @host_exeext@ build_exeext = @build_exeext@ - -# This allows overriding include paths in host specific Makefile -# (config/i386/x-mingw32 overrides those variables and local_includedir). -gplusplus_includedir = $(gcc_gxx_include_dir) -gplusplus_tool_includedir = $(gcc_gxx_include_dir)/$(target_noncanonical) -gplusplus_backward_includedir = $(gcc_gxx_include_dir)/backward -native_system_includedir = $(NATIVE_SYSTEM_HEADER_DIR) - - # Directory in which to put man pages. mandir = @mandir@ man1dir = $(mandir)/man1 @@ -2793,14 +2784,14 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gplusplus_includedir)\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gplusplus_tool_includedir)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gplusplus_backward_includedir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DNATIVE_SYSTEM_HEADER_DIR=\"$(native_system_includedir)\" \ + -DNATIVE_SYSTEM_HEADER_DIR=\"$(NATIVE_SYSTEM_HEADER_DIR)\" \ -DPREFIX=\"$(prefix)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ @TARGET_SYSTEM_ROOT_DEFINE@ |