ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-22 10:39:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc-arm-none-eabi-7-2018-q2-update: Use G-expressions.

Browse source 
* gnu/packages/embedded.scm (gcc-arm-none-eabi-7-2018-q2-update)[arguments]:
Use G-expressions, just like the xgcc package; also remove trailing #T from
build phases.
This commit is contained in:
Ricardo Wurmus 2023-04-23 16:18:50 +02:00
parent 1b633a4082
commit 178ce335d6
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 42 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
gnu/packages/embedded.scm
View file

@ -310,54 +310,51 @@ (define-public gcc-arm-none-eabi-7-2018-q2-update
(arguments (arguments
(substitute-keyword-arguments (package-arguments xgcc) (substitute-keyword-arguments (package-arguments xgcc)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'expand-version-string (add-after 'unpack 'expand-version-string
(lambda _ (lambda _
(make-file-writable "gcc/DEV-PHASE") (make-file-writable "gcc/DEV-PHASE")
(with-output-to-file "gcc/DEV-PHASE" (with-output-to-file "gcc/DEV-PHASE"
(lambda () (lambda ()
(display "7-2018-q2-update"))) (display "7-2018-q2-update")))))
#t)) (add-after 'unpack 'fix-genmultilib
(add-after 'unpack 'fix-genmultilib (lambda _
(lambda _ (substitute* "gcc/genmultilib"
(substitute* "gcc/genmultilib" (("#!/bin/sh") (string-append "#!" (which "sh"))))))
(("#!/bin/sh") (string-append "#!" (which "sh")))) (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH
#t)) (lambda* (#:key inputs #:allow-other-keys)
(add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH (let ((gcc (assoc-ref inputs "gcc")))
(lambda* (#:key inputs #:allow-other-keys) ;; Remove the default compiler from CPLUS_INCLUDE_PATH to
(let ((gcc (assoc-ref inputs "gcc"))) ;; prevent header conflict with the GCC from native-inputs.
;; Remove the default compiler from CPLUS_INCLUDE_PATH to (setenv "CPLUS_INCLUDE_PATH"
;; prevent header conflict with the GCC from native-inputs. (string-join
(setenv "CPLUS_INCLUDE_PATH" (delete (string-append gcc "/include/c++")
(string-join (string-split (getenv "CPLUS_INCLUDE_PATH")
(delete (string-append gcc "/include/c++") #\:))
(string-split (getenv "CPLUS_INCLUDE_PATH") ":"))
#\:)) (format #t
":")) "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(format #t (getenv "CPLUS_INCLUDE_PATH")))))))
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
(getenv "CPLUS_INCLUDE_PATH"))
#t)))))
((#:configure-flags flags) ((#:configure-flags flags)
;; The configure flags are largely identical to the flags used by the ;; The configure flags are largely identical to the flags used by the
;; "GCC ARM embedded" project. ;; "GCC ARM embedded" project.
`(append (list "--enable-multilib" #~(append (list "--enable-multilib"
"--with-newlib" "--with-newlib"
"--with-multilib-list=rmprofile" "--with-multilib-list=rmprofile"
"--with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" "--with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm"
"--enable-plugins" "--enable-plugins"
"--disable-decimal-float" "--disable-decimal-float"
"--disable-libffi" "--disable-libffi"
"--disable-libgomp" "--disable-libgomp"
"--disable-libmudflap" "--disable-libmudflap"
"--disable-libquadmath" "--disable-libquadmath"
"--disable-libssp" "--disable-libssp"
"--disable-libstdcxx-pch" "--disable-libstdcxx-pch"
"--disable-nls" "--disable-nls"
"--disable-shared" "--disable-shared"
"--disable-threads" "--disable-threads"
"--disable-tls") "--disable-tls")
(delete "--disable-multilib" ,flags))))) (delete "--disable-multilib" #$flags)))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CROSS_C_INCLUDE_PATH") (variable "CROSS_C_INCLUDE_PATH")