futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: clang-15: Fix building on i686-linux.

Browse Source 
* gnu/packages/llvm.scm (clang-from-llvm)[arguments]: When building for
i686-linux on clang 15 or newer delete the 'make-dynamic-linker-cache
phase.

Change-Id: I0c8c273ce8eca100a97a9a64a4524558acd7cfbd
This commit is contained in:
Efraim Flashner 2024-06-30 09:15:29 +03:00
parent f3689976da
commit fc15524d37
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/llvm.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018–2022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2021-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2021-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2018 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
@ -376,6 +376,11 @@ until LLVM/Clang 14."
"add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\ "add_subdirectory(${LLVM_THIRD_PARTY_DIR}/uni\
ttest third-party/unittest)\n" line)))))) ttest third-party/unittest)\n" line))))))
'()) '())
;; The build daemon goes OOM on i686-linux on this phase.
,@(if (and (version>=? version "15")
(target-x86-32?))
'((delete 'make-dynamic-linker-cache))
'())
;; Awkwardly, multiple phases added after the same phase, ;; Awkwardly, multiple phases added after the same phase,
;; e.g. unpack, get applied in the reverse order. In other ;; e.g. unpack, get applied in the reverse order. In other
;; words, adding 'change-directory last means it occurs ;; words, adding 'change-directory last means it occurs