* [bug#62917] [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"'
@ 2024-10-22 10:49 ` Marco Fortina
2024-10-22 10:49 ` bug#62917: " Marco Fortina
2024-12-15 4:36 ` [bug#62917] " Maxim Cournoyer
0 siblings, 2 replies; 3+ messages in thread
From: Marco Fortina @ 2024-10-22 10:49 UTC (permalink / raw)
To: guix-patches@gnu.org, guix-devel@gnu.org
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
This patch closes issue when running "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain" or "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain":
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a219b2ac89..37f11395f9 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -464,7 +464,8 @@ (define (setup-fhs profile)
;; /bin since that already has the sh symlink and the other (optional) FHS
;; bin directories will link to /bin.
(let ((gcc-path (string-append profile "/bin/gcc")))
- (if (file-exists? gcc-path)
+ (if (and (file-exists? gcc-path)
+ (not (file-exists? "/bin/cc")))
(symlink gcc-path "/bin/cc")))
;; Guix's ldconfig doesn't search in FHS default locations, so provide a
Cheers,
Marco
[-- Attachment #2: Type: text/html, Size: 3665 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#62917: [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"'
2024-10-22 10:49 ` [bug#62917] [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"' Marco Fortina
@ 2024-10-22 10:49 ` Marco Fortina
2024-12-15 4:36 ` [bug#62917] " Maxim Cournoyer
1 sibling, 0 replies; 3+ messages in thread
From: Marco Fortina @ 2024-10-22 10:49 UTC (permalink / raw)
To: guix-patches@gnu.org, guix-devel@gnu.org
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
This patch closes issue when running "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain" or "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain":
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index a219b2ac89..37f11395f9 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -464,7 +464,8 @@ (define (setup-fhs profile)
;; /bin since that already has the sh symlink and the other (optional) FHS
;; bin directories will link to /bin.
(let ((gcc-path (string-append profile "/bin/gcc")))
- (if (file-exists? gcc-path)
+ (if (and (file-exists? gcc-path)
+ (not (file-exists? "/bin/cc")))
(symlink gcc-path "/bin/cc")))
;; Guix's ldconfig doesn't search in FHS default locations, so provide a
Cheers,
Marco
[-- Attachment #2: Type: text/html, Size: 3665 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [bug#62917] [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"'
2024-10-22 10:49 ` [bug#62917] [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"' Marco Fortina
2024-10-22 10:49 ` bug#62917: " Marco Fortina
@ 2024-12-15 4:36 ` Maxim Cournoyer
1 sibling, 0 replies; 3+ messages in thread
From: Maxim Cournoyer @ 2024-12-15 4:36 UTC (permalink / raw)
To: Marco Fortina, Ludovic Courtès
Cc: guix-patches@gnu.org, guix-devel@gnu.org
Hi Marco,
Marco Fortina <marco_fortina@hotmail.it> writes:
> This patch closes issue when running "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain" or "guix shell --container --emulate-fhs clang-toolchain gcc-toolchain":
>
>
> diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
> index a219b2ac89..37f11395f9 100644
> --- a/guix/scripts/environment.scm
> +++ b/guix/scripts/environment.scm
> @@ -464,7 +464,8 @@ (define (setup-fhs profile)
> ;; /bin since that already has the sh symlink and the other (optional) FHS
> ;; bin directories will link to /bin.
> (let ((gcc-path (string-append profile "/bin/gcc")))
> - (if (file-exists? gcc-path)
> + (if (and (file-exists? gcc-path)
> + (not (file-exists? "/bin/cc")))
> (symlink gcc-path "/bin/cc")))
>
> ;; Guix's ldconfig doesn't search in FHS default locations, so provide a
I see Ludovic pushed a variant of the above fix with
23ab6fc29f28b0fa9ad94bf2ceed135ee3fdea34, and attributed your discovery
of the problem.
Good. Thanks for the report and patch!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-15 4:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <2085439243.1521663.1681776855547@privateemail.com>
2024-10-22 10:49 ` [bug#62917] [bug#73799] [PATCH] Fix 'guix shell: error: symlink: File exists: "/bin/cc"' Marco Fortina
2024-10-22 10:49 ` bug#62917: " Marco Fortina
2024-12-15 4:36 ` [bug#62917] " Maxim Cournoyer
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).