Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020

Cross compilation fixes [april 2020]
This commit is contained in:
Matthew Bauer
2020-04-13 16:48:38 -04:00
committed by GitHub
36 changed files with 187 additions and 83 deletions

View File

@@ -23,14 +23,14 @@ in stdenv.mkDerivation {
./2.6.2-cxx.patch
];
preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}";
preConfigure = "export LD=${stdenv.cc.targetPrefix}c++";
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE =
stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9";
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
buildPhase = ''
# use STL (xbmc requires it)
sed '1i#define TIXML_USE_STL 1' -i tinyxml.h