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: Use 'gcc-configure-flags-for-triplet' for native compilers too.

Browse source 
* gnu/packages/gcc.scm (gcc-configure-flags-for-triplet): Do not export it.
  (gcc-4.7): Pass the result of 'gcc-configure-flags-for-triplet' to configure
  for all builds, including native ones.
* gnu/packages/cross-base.scm (cross-gcc-arguments): Do not add the result of
  'gcc-configure-flags-for-triplet' here, since it is now included in the
  configure-flags inherited from gcc-4.8.
This commit is contained in:
Mark H Weaver 2015-01-07 15:00:44 +00:00
parent 8eb8048432
commit 76e639a00f
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/cross-base.scm
View file

@ -88,7 +88,6 @@ may be either a libc package or #f.)"
(substitute-keyword-arguments (package-arguments gcc-4.8) (substitute-keyword-arguments (package-arguments gcc-4.8)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list ,(string-append "--target=" target) `(append (list ,(string-append "--target=" target)
,@(gcc-configure-flags-for-triplet target)
,@(if libc ,@(if libc
'() '()
`( ;; Disable features not needed at this stage. `( ;; Disable features not needed at this stage.

12
gnu/packages/gcc.scm
View file

@ -36,7 +36,7 @@
;; Base URL for GCC's infrastructure. ;; Base URL for GCC's infrastructure.
"ftp://gcc.gnu.org/pub/gcc/infrastructure/") "ftp://gcc.gnu.org/pub/gcc/infrastructure/")
(define-public (gcc-configure-flags-for-triplet target) (define (gcc-configure-flags-for-triplet target)
"Return a list of additional GCC `configure' flags for TARGET, a GNU triplet. "Return a list of additional GCC `configure' flags for TARGET, a GNU triplet.
The purpose of this procedure is to translate extended GNU triplets---e.g., The purpose of this procedure is to translate extended GNU triplets---e.g.,
@ -102,11 +102,11 @@ where the OS part is overloaded to denote a specific ABI---into GCC
"/include") "/include")
"--without-headers"))) "--without-headers")))
;; When cross-compiling GCC, pass the right options for the ;; Pass the right options for the target triplet.
;; target triplet. (let ((triplet
(or (and=> (%current-target-system) (or (%current-target-system)
gcc-configure-flags-for-triplet) (nix-system->gnu-triplet (%current-system)))))
'()) (gcc-configure-flags-for-triplet triplet))
(maybe-target-tools)))))) (maybe-target-tools))))))
(package (package