about summary refs log tree commit diff
path: root/nixpkgs/pkgs/build-support/bintools-wrapper
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-05-07 17:46:11 +0000
committerAlyssa Ross <hi@alyssa.is>2019-05-07 17:46:11 +0000
commit0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea (patch)
treead528e0ffd64d471f2bf250670c0732bff57e86b /nixpkgs/pkgs/build-support/bintools-wrapper
parent373507e28edeacd168b5c240840db2dac854882a (diff)
parent2ec5e9595becf05b052ce4c61a05d87ce95d19af (diff)
downloadnixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.gz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.bz2
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.lz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.xz
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.tar.zst
nixlib-0a67dc6d2aa5f6ac3d08a12eb5e26d5fda5734ea.zip
Merge commit '2ec5e9595becf05b052ce4c61a05d87ce95d19af'
Diffstat (limited to 'nixpkgs/pkgs/build-support/bintools-wrapper')
-rw-r--r--nixpkgs/pkgs/build-support/bintools-wrapper/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index 964ff1175538..e1ec09bc95a1 100644
--- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/nixpkgs/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;