me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gnulib: Refer to "gcc" as provided via implicit package inputs.

Browse source 
Fixes <https://issues.guix.gnu.org/60947>.

Previously, with the #+(file-append gcc "/bin/gcc") reference, the
resulting derivation would end up referring to the grafted GCC when
grafts are enabled, and to the ungrafted one otherwise.  As a result, a
different derivation would be produced depending on whether grafts are
enabled.

* gnu/packages/build-tools.scm (gnulib-checkout)[arguments]: Refer to
"gcc", not #+(file-append gcc "/bin/gcc").
This commit is contained in:
Ludovic Courtès 2023-01-19 17:21:05 +01:00
parent 825c2c5174
commit 88854b1a4e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/build-tools.scm
View file

@ -929,7 +929,7 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
(with-directory-excursion "lib" (with-directory-excursion "lib"
;; See the compile-command buffer-local variable in ;; See the compile-command buffer-local variable in
;; lib/gen-uni-tables.c ;; lib/gen-uni-tables.c
(invoke #+(file-append gcc "/bin/gcc") "-O" "-Wall" "gen-uni-tables.c" (invoke "gcc" "-O" "-Wall" "gen-uni-tables.c"
"-Iunictype" "-o" "gen-uni-tables") "-Iunictype" "-o" "gen-uni-tables")
(apply invoke (apply invoke
"./gen-uni-tables" "./gen-uni-tables"