aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-02-15 08:46:39 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2006-02-15 08:46:39 +0100
commitdd8d6dfe799a66185fbcd5fe074cffa04d45e275 (patch)
treede43e2887704ae8b3ec08a0cb5c51194fc73b422 /gcc/fortran
parentb5b7039effaf21bad366d66ecffa2a0b457c9ae7 (diff)
downloadgcc-dd8d6dfe799a66185fbcd5fe074cffa04d45e275.zip
gcc-dd8d6dfe799a66185fbcd5fe074cffa04d45e275.tar.gz
gcc-dd8d6dfe799a66185fbcd5fe074cffa04d45e275.tar.bz2
re PR libgomp/25938 (libgomp installs header files in version and target independent location)
PR libgomp/25938 PR libgomp/25984 fortran/ * Make-lang.in (install-finclude-dir): New goal. (fortran.install-common): Depend on install-finclude-dir. * lang-specs.h: If not -nostdinc, add -I finclude. libgomp/ * Makefile.am (fincludedir): New variable. (nodist_include_HEADERS): Remove Fortran files. (nodist_finclude_HEADERS): New variable. * Makefile.in: Regenerated. From-SVN: r111018
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/Make-lang.in7
-rw-r--r--gcc/fortran/lang-specs.h8
3 files changed, 18 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4cff233..5c6a3f7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-15 Jakub Jelinek <jakub@redhat.com>
+
+ PR libgomp/25938
+ PR libgomp/25984
+ * Make-lang.in (install-finclude-dir): New goal.
+ (fortran.install-common): Depend on install-finclude-dir.
+ * lang-specs.h: If not -nostdinc, add -I finclude.
+
2006-02-14 Thomas Koenig <Thomas.Koenig@online.de>
PR fortran/25045
diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in
index 74af449..3c704eb 100644
--- a/gcc/fortran/Make-lang.in
+++ b/gcc/fortran/Make-lang.in
@@ -172,13 +172,18 @@ $(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
gfortran.pod: $(GFORTRAN_TEXI)
-$(TEXI2POD) < $(srcdir)/fortran/invoke.texi > $@
+# Create or recreate the gfortran private include file directory.
+install-finclude-dir: installdirs
+ -rm -rf $(DESTDIR)$(libsubdir)/finclude
+ mkdir $(DESTDIR)$(libsubdir)/finclude
+ -chmod a+rx $(DESTDIR)$(libsubdir)/finclude
#
# Install hooks:
# f951 is installed elsewhere as part of $(COMPILERS).
# Install the driver program as $(target)-gfortran
# and also as either gfortran (if native) or $(tooldir)/bin/gfortran.
-fortran.install-common: installdirs
+fortran.install-common: install-finclude-dir installdirs
-if [ -f f951$(exeext) ] ; then \
rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
$(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
diff --git a/gcc/fortran/lang-specs.h b/gcc/fortran/lang-specs.h
index eac5caa..55c4d1e 100644
--- a/gcc/fortran/lang-specs.h
+++ b/gcc/fortran/lang-specs.h
@@ -15,7 +15,7 @@ This file is licensed under the GPL. */
%{E|M|MM:%(cpp_debug_options)}\
%{!M:%{!MM:%{!E: -o %|.f |\n\
f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\
- -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{".F90", "@f95-cpp-input", 0, 0, 0},
{".F95", "@f95-cpp-input", 0, 0, 0},
{"@f95-cpp-input",
@@ -23,13 +23,13 @@ This file is licensed under the GPL. */
%{E|M|MM:%(cpp_debug_options)}\
%{!M:%{!MM:%{!E: -o %|.f95 |\n\
f951 %|.f95 %(cc1_options) %{J*} %{I*}\
- -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{".f90", "@f95", 0, 0, 0},
{".f95", "@f95", 0, 0, 0},
{"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
- %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
+ %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
{".f", "@f77", 0, 0, 0},
{".for", "@f77", 0, 0, 0},
{".FOR", "@f77", 0, 0, 0},
{"@f77", "%{!E:f951 %i %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\
- %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
+ %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},