wasilibc: use .imports file for lld

instead of passing in the --allow-undefined-file, we can just let lld find the file.
2019-04-17 19:49:12 -04:00 · 2019-04-17 19:49:12 -04:00 · 6948ffd398
commit 6948ffd398
parent a4cfd50004
2 changed files with 1 additions and 2 deletions
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@ -301,8 +301,6 @@ stdenv.mkDerivation {

    + optionalString targetPlatform.isWasm ''
      hardening_unsupported_flags+=" stackprotector fortify pie pic"
-    '' + optionalString (targetPlatform.isWasm && libc != null) ''
-      echo "--allow-undefined-file=${libc}/share/wasm32-wasi/undefined-symbols.txt" >> $out/nix-support/cc-ldflags
    ''

    + optionalString (libc != null && targetPlatform.isAvr) ''
--- a/pkgs/development/libraries/wasilibc/default.nix
+++ b/pkgs/development/libraries/wasilibc/default.nix
@ -17,6 +17,7 @@ stdenv.mkDerivation {

  postInstall = ''
    mv $out/lib/*/* $out/lib
+    ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
  '';

  meta = {