ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

android-ndk: change to targetPrefix

Browse Source
This commit is contained in:
cidkidnix 2022-09-29 08:58:12 -05:00
parent 20b67d38c7
commit 2fda814620
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -49,19 +49,18 @@ let
# targetInfo.triple is what Google thinks the toolchain should be, this is a little
# different from what we use. We make it four parts to conform with the existing
# standard more properly.
targetConfig = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config);
prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-");
in
rec {
# Misc tools
binaries = stdenv.mkDerivation {
pname = "${targetConfig}-ndk-toolchain";
pname = "${targetPrefix}ndk-toolchain";
inherit (androidndk) version;
nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
propagatedBuildInputs = [ androidndk ];
passthru = {
targetPrefix = prefix;
inherit targetPrefix;
isClang = true; # clang based cc, but bintools ld
};
dontUnpack = true;
@ -93,23 +92,23 @@ rec {
ln -s $out/toolchain/bin $out/bin
ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/
for f in $out/bin/${targetInfo.triple}-*; do
ln -s $f ''${f/${targetInfo.triple}-/${targetConfig}-}
ln -s $f ''${f/${targetInfo.triple}-/${targetPrefix}}
done
for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do
ln -s $f ''${f/${targetInfo.triple}/${targetConfig}}
ln -s $f ''${f/${targetInfo.triple}/${targetPrefix}}
done
rm -f $out/bin/${targetConfig}-ld
ln -s $out/bin/lld $out/bin/${targetConfig}-ld
rm -f $out/bin/${targetPrefix}ld
ln -s $out/bin/lld $out/bin/${targetPrefix}ld
(cd $out/bin;
for tool in llvm-*; do
ln -sf $tool ${targetConfig}-$(echo $tool | sed 's/llvm-//')
ln -sf $tool ${targetPrefix}$(echo $tool | sed 's/llvm-//')
ln -sf $tool $(echo $tool | sed 's/llvm-//')
done)
# handle last, as llvm-as is for llvm bytecode
ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetConfig}-as
ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetPrefix}as
ln -sf $out/bin/${targetInfo.triple}-as $out/bin/as
patchShebangs $out/bin