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

gnu: gcc: Fix cross-compilation of gcc (Canadian cross). 

* gnu/packages/gcc.scm (gcc-4.7)[arguments] <#:make-flags>:
  When (%current-target-system) is true, pass the empty list or
  '("CFLAGS=-g0 -O2").
This commit is contained in:
Ludovic Courtès 2014-06-14 16:04:30 +02:00
parent 6e3ecad6ca
commit fd0b276624
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/gcc.scm
View File

@ -133,7 +133,13 @@ where the OS part is overloaded to denote a specific ABI---into GCC
#:strip-binaries? ,stripped? #:strip-binaries? ,stripped?
#:configure-flags ,(configure-flags) #:configure-flags ,(configure-flags)
#:make-flags #:make-flags
(let* ((libc (assoc-ref %build-inputs "libc")) ;; None of the flags below are needed when doing a Canadian cross.
;; TODO: Simplify this.
,(if (%current-target-system)
(if stripped?
''("CFLAGS=-g0 -O2")
''())
`(let* ((libc (assoc-ref %build-inputs "libc"))
(libc-native (or (assoc-ref %build-inputs "libc-native") (libc-native (or (assoc-ref %build-inputs "libc-native")
libc))) libc)))
`(,@(if libc `(,@(if libc
@ -150,7 +156,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC
"-Wl,-dynamic-linker " "-Wl,-dynamic-linker "
"-Wl," libc-native ,(glibc-dynamic-linker)) "-Wl," libc-native ,(glibc-dynamic-linker))
,(string-append "BOOT_CFLAGS=-O2 " ,(string-append "BOOT_CFLAGS=-O2 "
,(if stripped? "-g0" "-g")))) ,(if stripped? "-g0" "-g")))))
#:tests? #f #:tests? #f
#:phases #:phases