diff options
| author | Tadek Kijkowski <tkijkowski@gmail.com> | 2016-12-02 16:34:28 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 2016-12-02 09:34:28 -0700 |
| commit | d2c82d98de3100a10731d982bf3fe571dba03e13 (patch) | |
| tree | 338ec589826d1d10017bbfae8fed8b480efe4454 /gcc/Makefile.in | |
| parent | 17c69eff82d20174099bad6bbd67dbf5e76c39a5 (diff) | |
| download | gcc-d2c82d98de3100a10731d982bf3fe571dba03e13.zip gcc-d2c82d98de3100a10731d982bf3fe571dba03e13.tar.gz gcc-d2c82d98de3100a10731d982bf3fe571dba03e13.tar.bz2 | |
Makefile.in (PREPROCESSOR_DEFINES): Add a level of indirection for several include directories that may be relative...
* 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.
From-SVN: r243196
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index df4f64f..c7b1eaf 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -675,6 +675,15 @@ 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 @@ -2768,14 +2777,14 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\" PREPROCESSOR_DEFINES = \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gplusplus_includedir)\" \ -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gplusplus_tool_includedir)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gplusplus_backward_includedir)\" \ -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DNATIVE_SYSTEM_HEADER_DIR=\"$(NATIVE_SYSTEM_HEADER_DIR)\" \ + -DNATIVE_SYSTEM_HEADER_DIR=\"$(native_system_includedir)\" \ -DPREFIX=\"$(prefix)/\" \ -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ @TARGET_SYSTEM_ROOT_DEFINE@ |