summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2025-08-26 10:27:15 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2025-08-26 10:27:15 +0900
commit2c922f9371ada3c95bd429d0821d6f33428dbc99 (patch)
treeb5a80b46cbb9a0467e7461eb8538442159d4b606
parent0dbe72111f985ecb8d14a9498ee04e0784331244 (diff)
gnu: gdc: Fix build.
* gnu/packages/gcc.scm (gdc): Add gdc-11 (and gcc) to native inputs. Fixes: #1460 Co-authored-by: Dariqq <dariqq@posteo.net> Change-Id: I1d25704829d48a9819cc493e227b050083b18ea4
-rw-r--r--gnu/packages/gcc.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index bd20f3f606..8ce59145ec 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -1285,7 +1285,7 @@ as the 'native-search-paths' field."
"gfortran" '("fortran")
%generic-search-paths)))
-(define-public gdc-11
+(define-public gdc-11 ;kept for bootstrapping
(hidden-package
(custom-gcc gcc-11 "gdc" '("d")
%generic-search-paths)))
@@ -1293,8 +1293,18 @@ as the 'native-search-paths' field."
;;; Alias tracking the latest GDC version.
(define-public gdc
(hidden-package
- (custom-gcc gcc "gdc" '("d")
- %generic-search-paths)))
+ (let ((base (custom-gcc gcc
+ "gdc" '("d")
+ %generic-search-paths)))
+ (package
+ (inherit base)
+ (native-inputs
+ (modify-inputs (package-native-inputs base)
+ ;; Since GCC 12, GDC is self-hosted, requiring a version of itself
+ ;; to build.
+ ;; XXX: GCC must be prepended as well to avoid an issue with the C++
+ ;; headers ordering.
+ (prepend gcc gdc-11)))))))
(define-public gm2
(hidden-package