From 6b9229ca512a38160156635edc9334eee44470ec Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 14 Jun 2014 22:16:03 +0200 Subject: gnu: gcc: Don't use the 'install-strip' target when cross-compiling. * gnu/packages/gcc.scm (gcc-4.7): Add 'install-target' variable. Use it in the 'install' phase. --- gnu/packages/gcc.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gcc.scm') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 86134811d3..e845b6ccb4 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -51,6 +51,13 @@ (define-public (gcc-configure-flags-for-triplet target) (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")) (maybe-target-tools (lambda () ;; Return the `_FOR_TARGET' variables that are needed when @@ -231,10 +238,7 @@ (define-public gcc-4.7 (alist-replace 'install (lambda* (#:key outputs #:allow-other-keys) (zero? - (system* "make" - ,(if stripped? - "install-strip" - "install")))) + (system* "make" ,install-target))) %standard-phases))))) (native-search-paths -- cgit v1.2.3