fix the isStatic flag, dedup the uclibc flags

NixOS · May 7, 2024 · f9c984d · f9c984d
1 parent 7bef51a
commit f9c984d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
@@ -184,7 +184,7 @@ let
       # don't support dynamic linking, but don't get the `staticMarker`.
       # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always
       # has the `staticMarker`.
-      isStatic = final.isWasm || final.isRedox;
+      isStatic = final.isWasm || final.isRedox || final.isUClibc;
 
       # Just a guess, based on `system`
       inherit

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
@@ -139,11 +139,11 @@ rec {
     libc = "uclibc";
     gcc.arch = "rv32ima";
     gcc.abi = "ilp32";
-  };
-
-  riscv32-nommu-musl = {
-    config = "riscv32-unknown-linux-musl";
-    libc = "musl";
+    uclibc.extraConfig = ''
+      UCLIBC_FORMAT_ELF y
+      STATIC_PIE y
+      HAVE_SHARED y
+    '';
   };
 
   mips64-embedded = {

diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -76,12 +76,9 @@ let
     HAS_NO_THREADS n
     UCLIBC_HAS_THREADS y
     UCLIBC_HAS_UTMPX y
-    HAVE_SHARED y
     ARCH_HAS_NO_SHARED n
     HAVE_LDSO y
-    STATIC_PIE y
     DOPIC y
-    UCLIBC_FORMAT_ELF y
   '';
   # UCLIBC_HAS_UTMPX is needed by busybox
 in