On Tue, Nov 20, 2018 at 03:14:02PM +0100, Martin Liška wrote:
> Following patch is a follow up of the discussion we had on IRC about
> locations where a Fortran pre-include should be searched.
>
> With the patch applied I see now:
> $ strace -f -s512 ./xgcc -B. ~/Programming/testcases/usage.F90 -c 2>&1 |
> grep math-vector
> access("./x86_64-pc-linux-gnu/9.0.0/math-vector-fortran.h", R_OK) = -1 ENOENT
> (No such file or directory)
> access("./math-vector-fortran.h", R_OK) = -1 ENOENT (No such file or
> directory)
> access("/home/marxin/bin/gcc2/bin/../include/finclude/x86_64-pc-linux-gnu/9.0.0/math-vector-fortran.h",
> R_OK) = -1 ENOENT (No such file or directory)
> access("/home/marxin/bin/gcc2/bin/../include/finclude/math-vector-fortran.h",
> R_OK) = -1 ENOENT (No such file or directory)
> access("/usr/include/finclude/x86_64-pc-linux-gnu/9.0.0/math-vector-fortran.h",
> R_OK) = -1 ENOENT (No such file or directory)
> access("/usr/include/finclude/math-vector-fortran.h", R_OK) = -1 ENOENT (No
> such file or directory)
>
> static const char *
> find_fortran_preinclude_file (int argc, const char **argv)
> {
> + char *result = NULL;
> if (argc != 2)
> return NULL;
>
it doesn't search the same directory as is normally searched for Fortran
modules; that is finclude%s and thus would need to be yet another
argument to this spec internal function and you'd check if
a file exists with that prefix
> + struct path_prefix prefixes = { 0, 0, "preinclude" };
> + add_prefix (&prefixes, STANDARD_BINDIR_PREFIX "../include/finclude/", NULL,
> + 0, 0, 0);
> + add_prefix (&prefixes, "/usr/include/finclude/", NULL, 0, 0, 0);
hardcoding /usr/include looks just very wrong here. That should always be
dependent on the configured prefix or better be relative from the driver,
gcc should be relocatable. Or at least come from configure. It should e.g.
honor the sysroot stuff etc.
That said, I think you need somebody familiar with the driver, perhaps
Joseph?
Jakub
