Merge pull request #82882 from obsidiansystems/armv6-embedded

Misc fixes for armv6 bare metal cross
2020-03-19 10:38:22 -04:00
parent d96bd3394b 7c0d3f6f70
commit 19a0b38cbe
12 changed files with 99 additions and 49 deletions
@@ -10,7 +10,7 @@
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , propagateDoc ? cc != null && cc ? man
-, extraPackages ? [], extraBuildCommands ? ""
+, extraTools ? [], extraPackages ? [], extraBuildCommands ? ""
 , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
 , libcxx ? null
@@ -214,7 +214,7 @@ stdenv.mkDerivation {
    '';

  strictDeps = true;
-  propagatedBuildInputs = [ bintools ];
+  propagatedBuildInputs = [ bintools ] ++ extraTools;
  depsTargetTargetPropagated = extraPackages;

  wrapperName = "CC_WRAPPER";