aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorAaron W. LaFramboise <aaronavay62@aaronwl.com>2004-12-01 18:42:12 -0600
committerPaul Brook <pbrook@gcc.gnu.org>2004-12-02 00:42:12 +0000
commitf49b3d362834228d3d7120cfca638b3e587adbd8 (patch)
tree0c72ff80893a2bf936d885b1a7ec2857f642283c /libgfortran
parent5b3f9cab6a8e420a32c293f5d6002f5f4426dc14 (diff)
downloadgcc-f49b3d362834228d3d7120cfca638b3e587adbd8.zip
gcc-f49b3d362834228d3d7120cfca638b3e587adbd8.tar.gz
gcc-f49b3d362834228d3d7120cfca638b3e587adbd8.tar.bz2
Makefile.am (AM_CPPFLAGS): Use -iquote instead of -I.
2004-12-01 Aaron W. LaFramboise <aaronavay62@aaronwl.com> * Makefile.am (AM_CPPFLAGS): Use -iquote instead of -I. From-SVN: r91602
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog4
-rw-r--r--libgfortran/Makefile.am4
-rw-r--r--libgfortran/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1967619..59c05ee 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-01 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
+
+ * Makefile.am (AM_CPPFLAGS): Use -iquote instead of -I.
+
2004-11-28 Bud Davis <bdavis9659@comcast.net>
* io/unix.c (mmap_alloc_w_a): check for a write to a location
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 50a3dac..d93b5f3 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -13,7 +13,9 @@ libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgfortranbegin_la_SOURCES = fmain.c
libgfortranbegin_la_LDFLAGS = -static
-AM_CPPFLAGS = -I$(srcdir)/io
+## io.h conflicts with some a system header on some platforms, so
+## use -iquote
+AM_CPPFLAGS = -iquote$(srcdir)/io
libgfortranincludedir = $(includedir)/gforio
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index b8d8c74..91c326f 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -297,7 +297,7 @@ toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm
libgfortranbegin_la_SOURCES = fmain.c
libgfortranbegin_la_LDFLAGS = -static
-AM_CPPFLAGS = -I$(srcdir)/io
+AM_CPPFLAGS = -iquote$(srcdir)/io
libgfortranincludedir = $(includedir)/gforio
gfor_io_src = \
io/backspace.c \