Unverified Commit 1195c40a authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

edk2: Fix cross-compile (#497458)

parents 7a5d8e95 cdf448de
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ stdenv.mkDerivation (finalAttrs: {
          ++ attrs.nativeBuildInputs or [ ];
          strictDeps = true;

          env.${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;

          prePatch = ''
            rm -rf BaseTools
            ln -sv ${buildPackages.edk2}/BaseTools BaseTools
@@ -211,7 +209,14 @@ stdenv.mkDerivation (finalAttrs: {
        // removeAttrs attrs [
          "nativeBuildInputs"
          "depsBuildBuild"
          "env"
        ]
        // {
          env = {
            ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;
          }
          // (attrs.env or { });
        }
      );
  };
})