From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Truby <David.Truby@arm.com>
Subject: bug#32773: [PATCH] Fix clang libstdc++ header location search
Date: Wed, 13 Nov 2019 16:56:04 +0000
Message-ID: <20191113165516.56228-1-david.truby@arm.com>
References: <19ece273-ea75-fc9d-4e4b-aa3a68deab6d@yahoo.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:49471)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iUwEV-0008Uv-4l
 for bug-guix@gnu.org; Wed, 13 Nov 2019 12:15:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iUwET-0005NR-5t
 for bug-guix@gnu.org; Wed, 13 Nov 2019 12:15:06 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:51268)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1iUwEQ-0005Kz-M3
 for bug-guix@gnu.org; Wed, 13 Nov 2019 12:15:03 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1iUwEQ-0001ML-EE
 for bug-guix@gnu.org; Wed, 13 Nov 2019 12:15:02 -0500
In-Reply-To: <19ece273-ea75-fc9d-4e4b-aa3a68deab6d@yahoo.de>
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.32773.B.15736652765175@debbugs.gnu.org>
Content-Language: en-US
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: "guix-patches@gnu.org" <guix-patches@gnu.org>
Cc: nd <nd@arm.com>

---
 gnu/packages/llvm.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 33fb53d65e..0a7efe980f 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -202,6 +202,7 @@ compiler.  In LLVM this library is called \"compiler-rt=
\".")
                    (lambda* (#:key inputs #:allow-other-keys)
                      (let ((libc (assoc-ref inputs "libc"))
                            (compiler-rt (assoc-ref inputs "clang-runtime")=
)
+                           (gcc (assoc-ref inputs "gcc"))
                            (version
                             (string->number
                              ,(version-major (package-version clang-runtim=
e)))))
@@ -218,6 +219,10 @@ compiler.  In LLVM this library is called \"compiler-r=
t\".")
                             (("(^[[:blank:]]+LibDir =3D ).*" _ declaration=
)
                              (string-append declaration "\"" libc "/lib\";=
\n"))
=20
+                            ;; Make clang look for libstdc++ in the right =
location
+                            (("LibStdCXXIncludePathCandidates\\[\\] =3D \\=
{")
+                             (string-append "LibStdCXXIncludePathCandidate=
s[] =3D { \"" gcc "/include/c++\","))
+
                             ;; Make sure libc's libdir is on the search pa=
th, to
                             ;; allow crt1.o & co. to be found.
                             (("@GLIBC_LIBDIR@")
--=20
2.24.0