amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc-4.8: Unbreak embedded builds.

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

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

24
gnu/packages/gcc.scm
View file

@ -494,17 +494,19 @@ Go. It also includes runtime support libraries for these languages.")
(let ((parent (package (let ((parent (package
(inherit gcc-base) (inherit gcc-base)
(version (package-version this-package))))) (version (package-version this-package)))))
(substitute-keyword-arguments (package-arguments parent) (if (%current-target-system)
((#:modules modules %default-gnu-modules) (substitute-keyword-arguments (package-arguments parent)
`((srfi srfi-1) ((#:configure-flags flags '())
,@modules)) `(cons "CXX=g++ -std=c++03" ,flags)))
((#:configure-flags flags '()) (substitute-keyword-arguments (package-arguments parent)
`(cons "CXX=g++ -std=c++03" ,flags)) ((#:modules modules %default-gnu-modules)
;; For native builds of some GCC versions the C++ include path needs to `((srfi srfi-1)
;; be adjusted so it does not interfere with GCC's own build processes. ,@modules))
((#:phases phases) ((#:configure-flags flags '())
(if (%current-target-system) `(cons "CXX=g++ -std=c++03" ,flags))
phases ;; 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 `(modify-phases ,phases
(add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)