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

gnu: cross-base: Make the cross tools native inputs. 

* gnu/packages/cross-base.scm (cross-gcc): Change `inputs' to
  `native-inputs', and set `inputs' to the empty list.
  (cross-libc): Likewise.
This commit is contained in:
Ludovic Courtès 2013-06-25 20:57:14 +02:00
parent 7e873a6708
commit 0de71c233c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/cross-base.scm
View File

@ -175,7 +175,8 @@ GCC that does not target a libc; otherwise, target that libc."
;; <http://lists.fedoraproject.org/pipermail/arm/2010-August/000663.html> ;; <http://lists.fedoraproject.org/pipermail/arm/2010-August/000663.html>
;; for instance. ;; for instance.
#f)))) #f))))
(inputs
(native-inputs
`(("patch/cross-env-vars" `(("patch/cross-env-vars"
,(search-patch "gcc-cross-environment-variables.patch")) ,(search-patch "gcc-cross-environment-variables.patch"))
@ -193,6 +194,8 @@ GCC that does not target a libc; otherwise, target that libc."
,@inputs) ,@inputs)
inputs)))) inputs))))
(inputs '())
;; Only search target inputs, not host inputs. ;; Only search target inputs, not host inputs.
(search-paths (search-paths
(list (search-path-specification (list (search-path-specification
@ -225,9 +228,9 @@ XBINUTILS and the cross tool chain."
(and (zero? (system* "make" "defconfig")) (and (zero? (system* "make" "defconfig"))
(zero? (system* "make" "mrproper" "headers_check")))) (zero? (system* "make" "mrproper" "headers_check"))))
,phases)))) ,phases))))
(inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)
,@(package-inputs linux-libre-headers))))) ,@(package-native-inputs linux-libre-headers)))))
(package (inherit glibc) (package (inherit glibc)
(name (string-append "glibc-cross-" target)) (name (string-append "glibc-cross-" target))
@ -248,9 +251,9 @@ XBINUTILS and the cross tool chain."
#t)) #t))
,phases)))) ,phases))))
(propagated-inputs `(("cross-linux-headers" ,xlinux-headers))) (propagated-inputs `(("cross-linux-headers" ,xlinux-headers)))
(inputs `(("cross-gcc" ,xgcc) (native-inputs `(("cross-gcc" ,xgcc)
("cross-binutils" ,xbinutils) ("cross-binutils" ,xbinutils)
,@(package-inputs glibc))))) ,@(package-native-inputs glibc)))))
;;; ;;;