From: Richard Stallman Date: Mon, 18 Jan 1993 20:30:49 +0000 (+0000) Subject: (include_defaults): Do use GCC_INCLUDE_DIR for cross compiler. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ee40befe328bec580789418de44c8db43281ea7b;p=gcc.git (include_defaults): Do use GCC_INCLUDE_DIR for cross compiler. Move TOOL_INCLUDE_DIR later if cross. From-SVN: r3269 --- diff --git a/gcc/cccp.c b/gcc/cccp.c index aa0429175f1..54fb1b8ee72 100644 --- a/gcc/cccp.c +++ b/gcc/cccp.c @@ -540,12 +540,21 @@ static struct default_include { char *fname; int cplusplus; } include_defaults_a = { /* Pick up GNU C++ specific include files. */ { GPLUSPLUS_INCLUDE_DIR, 1}, - { TOOL_INCLUDE_DIR, 0}, #ifdef CROSS_COMPILE + /* This is the dir for fixincludes. Put it just before + the files that we fix. */ + { GCC_INCLUDE_DIR, 0}, /* For cross-compilation, this dir name is generated automatically in Makefile.in. */ { CROSS_INCLUDE_DIR, 0 }, + /* This is another place that the target system's headers might be. */ + { TOOL_INCLUDE_DIR, 0}, #else /* not CROSS_COMPILE */ + /* Until we are really clear on what people will use this dir for + in a native compiler, it's not clear where in the order it belongs. */ + { TOOL_INCLUDE_DIR, 0}, + /* This should be /use/local/include and should come before + the fixincludes-fixed header files. */ { LOCAL_INCLUDE_DIR, 0}, /* This is the dir for fixincludes. Put it just before the files that we fix. */