diff mbox

libstdc++-v3/fragment.am (AM_CPPFLAGS): Add CPPFLAGS

Message ID 559BE6D9.8030601@ssi-schaefer.com
State New
Headers show

Commit Message

Michael Haubenwallner July 7, 2015, 2:48 p.m. UTC 
Hi build machinery maintainers,

when the host system does not have the iconv-devel package installed,
but the target-prefix does contain iconv.h, in libstdc++/include the
creation of the precompiled headers fails with "<iconv.h> not found".

While libstdc++/configure detects INCICONV="-I$target_prefix/include"
and adds this to CPPFLAGS, the Makefiles do not transfer CPPFLAGS to
the compiler commandline.

Attached patch adds CPPFLAGS to AM_CPPFLAGS in libstdc++/fragment.am.

Thanks!
/haubi/

Comments

Michael Haubenwallner July 24, 2015, 7:05 a.m. UTC | #1 
On 07/07/2015 04:48 PM, Michael Haubenwallner wrote:
> Hi build machinery maintainers,
> 
> when the host system does not have the iconv-devel package installed,
> but the target-prefix does contain iconv.h, in libstdc++/include the
> creation of the precompiled headers fails with "<iconv.h> not found".
> 
> While libstdc++/configure detects INCICONV="-I$target_prefix/include"
> and adds this to CPPFLAGS, the Makefiles do not transfer CPPFLAGS to
> the compiler commandline.
> 
> Attached patch adds CPPFLAGS to AM_CPPFLAGS in libstdc++/fragment.am.

Trivial enough for no response, committed.

Thanks!
/haubi/
diff mbox

Patch

2015-07-07  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>

	* fragment.am (AM_CPPFLAGS): Add CPPFLAGS.
	* Makefile.in: Regenerate.
	* doc/Makefile.in: Regenerate.
	* include/Makefile.in: Regenerate.
	* libsupc++/Makefile.in: Regenerate.
	* po/Makefile.in: Regenerate.
	* python/Makefile.in: Regenerate.
	* src/Makefile.in: Regenerate.
	* src/c++11/Makefile.in: Regenerate.
	* src/c++98/Makefile.in: Regenerate.
	* src/filesystem/Makefile.in: Regenerate.
	* testsuite/Makefile.in: Regenerate.

Index: fragment.am
===================================================================
--- fragment.am	(revision 225515)
+++ fragment.am	(working copy)
@@ -34,5 +34,5 @@ 
 	$(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 225515)
+++ Makefile.in	(working copy)
@@ -338,7 +338,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 @GLIBCXX_HOSTED_TRUE@hosted_source = src doc po testsuite python
 SUBDIRS = include libsupc++ $(hosted_source)
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
Index: doc/Makefile.in
===================================================================
--- doc/Makefile.in	(revision 225515)
+++ doc/Makefile.in	(working copy)
@@ -320,7 +320,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 @BUILD_XML_FALSE@STAMP_XML = 
 
 # Documentation Overview
Index: include/Makefile.in
===================================================================
--- include/Makefile.in	(revision 225515)
+++ include/Makefile.in	(working copy)
@@ -310,7 +310,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Standard C++ includes.
 std_srcdir = ${glibcxx_srcdir}/include/std
Index: libsupc++/Makefile.in
===================================================================
--- libsupc++/Makefile.in	(revision 225515)
+++ libsupc++/Makefile.in	(working copy)
@@ -381,7 +381,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
Index: po/Makefile.in
===================================================================
--- po/Makefile.in	(revision 225515)
+++ po/Makefile.in	(working copy)
@@ -310,7 +310,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Location of installation directories.
 locale_installdir = $(DESTDIR)$(datadir)/locale
Index: python/Makefile.in
===================================================================
--- python/Makefile.in	(revision 225515)
+++ python/Makefile.in	(working copy)
@@ -340,7 +340,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 @ENABLE_PYTHONDIR_FALSE@pythondir = $(datadir)/gcc-$(gcc_version)/python
 @ENABLE_PYTHONDIR_TRUE@pythondir = $(prefix)/$(python_mod_dir)
 nobase_python_DATA = \
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 225515)
+++ src/Makefile.in	(working copy)
@@ -373,7 +373,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 @ENABLE_FILESYSTEM_TS_FALSE@filesystem_dir = 
 @ENABLE_FILESYSTEM_TS_TRUE@filesystem_dir = filesystem
 SUBDIRS = c++98 c++11 $(filesystem_dir)
Index: src/c++11/Makefile.in
===================================================================
--- src/c++11/Makefile.in	(revision 225515)
+++ src/c++11/Makefile.in	(working copy)
@@ -343,7 +343,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Convenience library for C++11 runtime.
 noinst_LTLIBRARIES = libc++11convenience.la
Index: src/c++98/Makefile.in
===================================================================
--- src/c++98/Makefile.in	(revision 225515)
+++ src/c++98/Makefile.in	(working copy)
@@ -344,7 +344,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Convenience library for C++98 runtime.
 noinst_LTLIBRARIES = libc++98convenience.la 
Index: src/filesystem/Makefile.in
===================================================================
--- src/filesystem/Makefile.in	(revision 225515)
+++ src/filesystem/Makefile.in	(working copy)
@@ -350,7 +350,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 toolexeclib_LTLIBRARIES = libstdc++fs.la
 headers = 
 sources = \
Index: testsuite/Makefile.in
===================================================================
--- testsuite/Makefile.in	(revision 225515)
+++ testsuite/Makefile.in	(working copy)
@@ -313,7 +313,7 @@ 
 
 
 # -I/-D flags to pass when compiling.
-AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS)
 
 # Generated lists of files to run.  All of these names are valid make
 # targets, if you wish to generate a list manually.