Merge pull request #84415 from matthewbauer/mb-cross-fixes-april2020
Cross compilation fixes [april 2020]
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user