mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates.
Conflicts: gnu/local.mk gnu/packages/build-tools.scm gnu/packages/certs.scm gnu/packages/check.scm gnu/packages/compression.scm gnu/packages/cups.scm gnu/packages/fontutils.scm gnu/packages/gnuzilla.scm gnu/packages/guile.scm gnu/packages/ibus.scm gnu/packages/image-processing.scm gnu/packages/linux.scm gnu/packages/music.scm gnu/packages/nss.scm gnu/packages/pdf.scm gnu/packages/python-xyz.scm gnu/packages/qt.scm gnu/packages/ruby.scm gnu/packages/shells.scm gnu/packages/tex.scm gnu/packages/video.scm gnu/packages/vulkan.scm gnu/packages/web.scm gnu/packages/webkit.scm gnu/packages/wm.scm
This commit is contained in:
commit
3bacd3c76a
231 changed files with 20528 additions and 7891 deletions
|
@ -217,7 +217,8 @@ bootstrapping more recent compilers written in D.")
|
|||
(package
|
||||
(inherit ldc-bootstrap)
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments ldc-bootstrap)
|
||||
(substitute-keyword-arguments
|
||||
(strip-keyword-arguments '(#:tests?) (package-arguments ldc-bootstrap))
|
||||
((#:make-flags _ #f)
|
||||
'(list "all"
|
||||
;; Also build the test runner binaries.
|
||||
|
@ -226,7 +227,6 @@ bootstrapping more recent compilers written in D.")
|
|||
`(,@flags "-DBUILD_SHARED_LIBS=ON"
|
||||
"-DLDC_LINK_MANUALLY=OFF"
|
||||
"-DLDC_DYNAMIC_COMPILE=OFF"))
|
||||
((#:tests? _) #t)
|
||||
((#:phases phases)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'fix-compiler-rt-library-discovery
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue