From 3614c6d1b59a2070f3f2993636be5253dedeb40a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Sep 2025 12:44:59 +0300 Subject: [PATCH] gnu: gcc-4.9: Unbreak embedded builds. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by Ludovic Courtès . * gnu/packages/gcc.scm (gcc-4.9)[arguments]: When cross-compiling don't adjust the inherited modules. Change-Id: I763746c25a8f24f89db8c6b100a6395b816cbcaf --- gnu/packages/gcc.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index c628f9ea8f5..3173878de44 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -562,17 +562,19 @@ Go. It also includes runtime support libraries for these languages.") (let ((parent (package (inherit gcc-base) (version (package-version this-package))))) - (substitute-keyword-arguments (package-arguments parent) - ((#:modules modules %default-gnu-modules) - `((srfi srfi-1) - ,@modules)) - ((#:configure-flags flags '()) - `(cons "CXX=g++ -std=c++11" ,flags)) - ;; For native builds of some GCC versions the C++ include path needs to - ;; be adjusted so it does not interfere with GCC's own build processes. - ((#:phases phases) - (if (%current-target-system) - phases + (if (%current-target-system) + (substitute-keyword-arguments (package-arguments parent) + ((#:configure-flags flags '()) + `(cons "CXX=g++ -std=c++11" ,flags))) + (substitute-keyword-arguments (package-arguments parent) + ((#:modules modules %default-gnu-modules) + `((srfi srfi-1) + ,@modules)) + ((#:configure-flags flags '()) + `(cons "CXX=g++ -std=c++11" ,flags)) + ;; For native builds of some GCC versions the C++ include path needs to + ;; be adjusted so it does not interfere with GCC's own build processes. + ((#:phases phases) `(modify-phases ,phases (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys)