diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-02-15 08:00:16 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-02-20 09:07:44 +0000 |
| commit | 4e9cfefb8a495b1dc8ab7793731aef2b5048efa0 (patch) | |
| tree | 0d245641ac89515705a07888ff5b83785a83476e /pkgs/development/interpreters | |
| parent | fce058c80e63d5f5be712717ee245426a5fa7d84 (diff) | |
| download | nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar.gz nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar.bz2 nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar.lz nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar.xz nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.tar.zst nixpkgs-4e9cfefb8a495b1dc8ab7793731aef2b5048efa0.zip | |
pkgsLLVM.guile, pkgsLLVM.guile_3_0: avoid -lgcc_s on clang, not just darwin
Otherwise pkgsLLVM.guile / pkgsLLVM.guile_3_0 fails early on linux.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/guile/2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/3.0.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 19ef0e60848..04c60e80e8f 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -83,9 +83,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 67c0e2b2064..99f3f84829c 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -82,9 +82,9 @@ builder rec { # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". - # don't have "libgcc_s.so.1" on darwin + # don't have "libgcc_s.so.1" on clang LDFLAGS = lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isStatic) "-lgcc_s"; + (stdenv.cc.isGNU && !stdenv.hostPlatform.isStatic) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix=${lib.getDev readline}" |