~ruther/guix-local: gnu: gcc: Really avoid 'install-strip' when cross-compiling.

5c860cec8329cbcf68504791c01b6ebd0571e783 — Ludovic Courtès 11 years ago 7470df5

gnu: gcc: Really avoid 'install-strip' when cross-compiling.

This is a followup to 6b9229c.

* gnu/packages/gcc.scm (gcc-4.7): Turn 'install-target' into a thunk,
  so (%current-target-system) is current.

patch browse .tar.gz

1 files changed, 8 insertions(+), 7 deletions(-)

M gnu/packages/gcc.scm

M gnu/packages/gcc.scm => gnu/packages/gcc.scm +8 -7

@@ 52,12 52,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
 (define-public gcc-4.7
   (let* ((stripped? #t)                           ; TODO: make this a parameter
          (install-target
-          ;; The 'install-strip' rule uses the native 'strip' instead of
-          ;; 'TARGET-strip' when cross-compiling.  Thus, use 'install' in that
-          ;; case.
-          (if (and stripped? (not (%current-target-system)))
-              "install-strip"
-              "install"))
+          (lambda ()
+            ;; The 'install-strip' rule uses the native 'strip' instead of
+            ;; 'TARGET-strip' when cross-compiling.  Thus, use 'install' in that
+            ;; case.
+            (if (and stripped? (not (%current-target-system)))
+                "install-strip"
+                "install")))
          (maybe-target-tools
           (lambda ()
             ;; Return the `_FOR_TARGET' variables that are needed when


@@ 238,7 239,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
            (alist-replace 'install
                           (lambda* (#:key outputs #:allow-other-keys)
                             (zero?
-                             (system* "make" ,install-target)))
+                             (system* "make" ,(install-target))))
                           %standard-phases)))))
 
       (native-search-paths