From 26830c2facbde04517814464d4cd099a6fe1dd08 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 16 Jan 2017 16:51:57 -0700 Subject: revert: Makefile.in (PREPROCESSOR_DEFINES): Add a level of indirection for several include directories that may be relative... Revert: 2016-12-02 Tadek Kijkowski * 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: r244510 --- gcc/config/i386/mingw32.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gcc/config/i386/mingw32.h') diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 1d988ca..543d851 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -161,8 +161,6 @@ along with GCC; see the file COPYING3. If not see fvtable-verify=std:vtv_end.o%s} \ crtend.o%s" -#if !defined(TARGET_SYSTEM_ROOT) - /* Override startfile prefix defaults. */ #ifndef STANDARD_STARTFILE_PREFIX_1 #define STANDARD_STARTFILE_PREFIX_1 "/mingw/lib/" @@ -176,8 +174,6 @@ along with GCC; see the file COPYING3. If not see #undef NATIVE_SYSTEM_HEADER_DIR #define NATIVE_SYSTEM_HEADER_DIR "/mingw/include" -#endif /* !defined(TARGET_SYSTEM_ROOT) */ - /* Output STRING, a string representing a filename, to FILE. We canonicalize it to be in Unix format (backslashes are replaced forward slashes. */ -- cgit v1.1