From 09d62629a91b7623ed9c86f4d52db32682ec88a0 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Mon, 11 Dec 2023 10:58:52 +0200
Subject: [PATCH] guix: search-paths: Fix obj-c++ search paths.

* guix/search-paths.scm ($OBJCPLUS_INCLUDE_PATH): Also search
'include/c++'.

Change-Id: I403674038c1c3bf1251c710031496363c924f19a
---
 guix/search-paths.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/search-paths.scm b/guix/search-paths.scm
index edd416ccdc..b2a0b838c0 100644
--- a/guix/search-paths.scm
+++ b/guix/search-paths.scm
@@ -100,7 +100,9 @@ (define $OBJC_INCLUDE_PATH
 (define $OBJCPLUS_INCLUDE_PATH
   (search-path-specification
    (variable "OBJCPLUS_INCLUDE_PATH")
-   (files '("include"))))
+   ;; Add 'include/c++' here so that <cstdlib>'s "#include_next
+   ;; <stdlib.h>" finds GCC's <stdlib.h>, not libc's.
+   (files '("include/c++" "include"))))
 
 (define $LIBRARY_PATH
   (search-path-specification