~ruther/guix-local: gnu: gcc-4.9: Unbreak embedded builds.

3614c6d1b59a2070f3f2993636be5253dedeb40a — Efraim Flashner 7 months ago 95500f9

gnu: gcc-4.9: Unbreak embedded builds.

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

patch browse .tar.gz

1 files changed, 13 insertions(+), 11 deletions(-)

M gnu/packages/gcc.scm

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +13 -11

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