Browse Source
Merge pull request #51 from gorgone/WXbet-patch-1
fix sysroot detection for android toolchains
pull/54/head
Gorgone
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
support/functions/_toolchain
|
|
|
@ -211,7 +211,7 @@ _toolchain_check(){ |
|
|
|
[ ${#_realcompiler} -gt 4 ] && compilername="$_realcompiler" |
|
|
|
version=$("./$compilername" -dumpversion) |
|
|
|
machine=$("./$compilername" -dumpmachine) |
|
|
|
sr=$("./$compilername" -print-sysroot 2>/dev/null) |
|
|
|
[ "$_androidndkdir" == "1" ] && sr="$tcdir/$1/sysroot" || sr=$("./$compilername" -print-sysroot 2>/dev/null) |
|
|
|
sysroot=${sr#"$tcdir/$1/bin/../"} |
|
|
|
compilerpath=$(realpath ./$compilername) |
|
|
|
printf "$w_l GCC Version :$y_l $version\n" |
|
|
|
|
