nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2014-06-14 23:28:28 +02:00
parent 7470df5ddf
commit 5c860cec83
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/gcc.scm
View File

@ -52,12 +52,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
(define-public gcc-4.7 (define-public gcc-4.7
(let* ((stripped? #t) ; TODO: make this a parameter (let* ((stripped? #t) ; TODO: make this a parameter
(install-target (install-target
(lambda ()
;; The 'install-strip' rule uses the native 'strip' instead of ;; The 'install-strip' rule uses the native 'strip' instead of
;; 'TARGET-strip' when cross-compiling. Thus, use 'install' in that ;; 'TARGET-strip' when cross-compiling. Thus, use 'install' in that
;; case. ;; case.
(if (and stripped? (not (%current-target-system))) (if (and stripped? (not (%current-target-system)))
"install-strip" "install-strip"
"install")) "install")))
(maybe-target-tools (maybe-target-tools
(lambda () (lambda ()
;; Return the `_FOR_TARGET' variables that are needed when ;; 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 (alist-replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (zero?
(system* "make" ,install-target))) (system* "make" ,(install-target))))
%standard-phases))))) %standard-phases)))))
(native-search-paths (native-search-paths