On 11/26/18 7:44 PM, Joseph Myers wrote: > On Mon, 26 Nov 2018, Martin Liška wrote: > >>> I don't see how this version ensures that NATIVE_SYSTEM_HEADER_DIR is >>> properly sysrooted. Note there's add_sysrooted_prefix separate from >>> add_prefix (but that's *not* the correct thing to use here because it uses >>> target_sysroot_suffix whereas you need target_sysroot_hdrs_suffix). >> >> I address that in updated version of the patch. > > However, this version seems to make TOOL_INCLUDE_DIR sysrooted as well. > I don't think that's correct; TOOL_INCLUDE_DIR ($prefix/$target/include, > roughly) is a non-sysroot location for headers. Note that it's not > sysrooted in cppdefault.c, which is a good guide to which directories > should or should not be sysrooted, and what order they should come in > (though as discussed, various of the directories there are not relevant > for the present issue). > > The patch appears to be against some tree other than current trunk. At > least, it shows a function find_fortran_preinclude_file in gcc.c as > already existing in the diff context, but I see no such function in the > current sources. >
I've just installed a prerequisite patch and now you should be able to apply the patch on top of current trunk. Thanks, Martin