Unverified Commit 45e3996b authored by Diogo Correia's avatar Diogo Correia
Browse files

pkgsCross.wasi32.buildPackages.rustc: fix build 

Fixes #463589
parent afaabaf7

pkgs/by-name/wa/wasilibc/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ stdenvNoLibc.mkDerivation (finalAttrs: { 


  preFixup = ''

    ln -s $share/share/undefined-symbols.txt $out/lib/wasi.imports

    ln -s $out/lib $out/lib/${stdenvNoLibc.system}

  ''

  + lib.optionalString (stdenvNoLibc.system != stdenvNoLibc.targetPlatform.rust.rustcTargetSpec) ''

    ln -s $out/lib $out/lib/${stdenvNoLibc.targetPlatform.rust.rustcTargetSpec}

  '';



  passthru.tests = {

pkgs/development/compilers/rust/rustc.nix

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ stdenv.mkDerivation (finalAttrs: { 
    ++ optionals stdenv.targetPlatform.isMusl [

      "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"

    ]

    ++ optionals stdenv.targetPlatform.isWasi [

      "${setTarget}.wasi-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}"

    ]

    ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [

      "--disable-docs"

    ]