jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasilibc: use .imports file for lld

Browse Source 
instead of passing in the --allow-undefined-file, we can just let lld
find the file.
This commit is contained in:
Matthew Bauer 2019-04-17 19:49:12 -04:00
parent a4cfd50004
commit 6948ffd398
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -301,8 +301,6 @@ stdenv.mkDerivation {
+ optionalString targetPlatform.isWasm '' + optionalString targetPlatform.isWasm ''
hardening_unsupported_flags+=" stackprotector fortify pie pic" 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) '' + optionalString (libc != null && targetPlatform.isAvr) ''

1
pkgs/development/libraries/wasilibc/default.nix
View File

@ -17,6 +17,7 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
mv $out/lib/*/* $out/lib mv $out/lib/*/* $out/lib
ln -s $out/share/wasm32-wasi/undefined-symbols.txt $out/lib/wasi.imports
''; '';
meta = { meta = {