Merge pull request #141999 from t184256/tinycc-static-fix

2021-10-17 22:54:05 +03:00 · 2021-10-17 22:54:05 +03:00 · 88b8068d66
commit 88b8068d66
parent 675c3b3d02 8eeae5320e
1 changed files with 4 additions and 1 deletions
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@ -19,12 +19,15 @@ stdenv.mkDerivation rec {
  '';

  configureFlags = [
-    "--cc=cc"
+    "--cc=$CC"
+    "--ar=$AR"
    "--crtprefix=${lib.getLib stdenv.cc.libc}/lib"
    "--sysincludepaths=${lib.getDev stdenv.cc.libc}/include:{B}/include"
    "--libpaths=${lib.getLib stdenv.cc.libc}/lib"
    # build cross compilers
    "--enable-cross"
+  ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+    "--config-musl"
  ];

  preConfigure = ''