From patchwork Tue Jul 7 14:48:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Haubenwallner X-Patchwork-Id: 492320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1E4101402BD for ; Wed, 8 Jul 2015 00:49:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=TJe7pHvV; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=Ct+igcBNlsLxEIalk2+cswkQvLU85eN+dXXhsmcjlJ/ yeeuq869aceWpfEYiPcfbWH855KVisWg3fRyMVcKs45dGfSthPWhGf4G58XJ0pj+ Mvkz4mf3BOjo1nWkPiDuOcqZmWsF7L5mD6AhX7qtbMRRposaXbW1nKMl8IXS0ri8 = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=yzahnatwjAEKDTBhidYHd2fPwlI=; b=TJe7pHvVW6q5g2K6z CA4TV6WlLGHD5BP89SNSMcQjsrpqwbehMONx4GITE1YYfja2E4/ft0z/rVcD5I4F KU3Rl1jw4aFnYaPRow2LdUM2oDbmA/QHpMS2pdWXHmiLGhJd6oD+U9PqEIQBjxRT HAbc8tIWWSXt7umbdswYUE7GIo= Received: (qmail 66294 invoked by alias); 7 Jul 2015 14:49:07 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 66268 invoked by uid 89); 7 Jul 2015 14:49:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.0 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 3 recipients X-HELO: smtp.salomon.at Received: from smtp.salomon.at (HELO smtp.salomon.at) (193.186.16.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Jul 2015 14:49:05 +0000 Received: from samail03.wamas.com ([172.28.2.2] helo=mailhost.salomon.at) by smtp.salomon.at with esmtps (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1ZCUB7-0000In-K4; Tue, 07 Jul 2015 16:48:58 +0200 Received: from [172.28.41.34] by mailhost.salomon.at with esmtp (Exim 4.77) (envelope-from ) id 1ZCUB7-0000lw-F4; Tue, 07 Jul 2015 16:48:57 +0200 Message-ID: <559BE6D9.8030601@ssi-schaefer.com> Date: Tue, 07 Jul 2015 16:48:57 +0200 From: Michael Haubenwallner User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Paolo Bonzini , DJ Delorie , Nathanael Nerode , Alexandre Oliva , Ralf Wildenhues CC: GCC Patches , libstdc++ Subject: [PATCH] libstdc++-v3/fragment.am (AM_CPPFLAGS): Add CPPFLAGS 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 " 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/ 2015-07-07 Michael Haubenwallner * 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.