bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-28 11:55:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc-4.9: Unbreak embedded builds.

Browse source 
Reported by Ludovic Courtès <ludo@gnu.org>.

* gnu/packages/gcc.scm (gcc-4.9)[arguments]: When cross-compiling don't
adjust the inherited modules.

Change-Id: I763746c25a8f24f89db8c6b100a6395b816cbcaf
This commit is contained in:
Efraim Flashner 2025-09-08 12:44:59 +03:00
parent 95500f96ab
commit 3614c6d1b5
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/packages/gcc.scm
View file

@ -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)