Merge branch 'impl/fix-libtapi-cross' into staging

This commit is contained in:
toonn 2022-09-25 19:19:25 +02:00
commit 3b8aa21fd1
No known key found for this signature in database
GPG key ID: 44FF902A66DF4576

View file

@ -40,12 +40,15 @@ stdenv.mkDerivation {
let
nativeCC = pkgsBuildBuild.stdenv.cc;
nativeBintools = nativeCC.bintools.bintools;
nativeLibcxxabi = lib.getLib pkgsBuildBuild.libcxxabi;
nativeToolchainFlags = [
"-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc"
"-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++"
"-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar"
"-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip"
"-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib"
"-DCMAKE_EXE_LINKER_FLAGS=-L${nativeLibcxxabi}/lib"
"-DCMAKE_SHARED_LINKER_FLAGS=-L${nativeLibcxxabi}/lib"
];
in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}"
)