diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 22:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 22:44:33 -0400 |
| commit | 7488a367af199dc61992bdd3451a4016bb0f0f5f (patch) | |
| tree | d93c0db58acb5c29c8cf6b73998e8cdcfb2e1396 /pkgs/build-support | |
| parent | 84d00355e8b288a0700ea1590897b75297ec3877 (diff) | |
| parent | 008c9a70a57f0448b275179bfbc10c8750f29069 (diff) | |
| download | nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.gz nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.bz2 nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.lz nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.xz nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.tar.zst nixlib-7488a367af199dc61992bdd3451a4016bb0f0f5f.zip | |
Merge pull request #56555 from matthewbauer/wasm
Initial WebAssembly/WASI cross-compilation support
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 964ff1175538..e1ec09bc95a1 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -191,7 +191,8 @@ stdenv.mkDerivation { else if targetPlatform.isAvr then "avr" else if targetPlatform.isAlpha then "alpha" else throw "unknown emulation for platform: ${targetPlatform.config}"; - in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); + in if targetPlatform.useLLVM or false then "" + else targetPlatform.platform.bfdEmulation or (fmt + sep + arch); strictDeps = true; depsTargetTargetPropagated = extraPackages; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 91948f415714..84548a6b1dfb 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -347,6 +347,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify" '' + + optionalString targetPlatform.isWasm '' + hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + + optionalString (libc != null && targetPlatform.isAvr) '' for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags |