From 92bd86139c1c59d130b582384ad45c0104023ab8 Mon Sep 17 00:00:00 2001 From: WXbet <57314510+WXbet@users.noreply.github.com> Date: Mon, 24 Feb 2020 17:51:22 +0100 Subject: [PATCH] Fix s3.TUP library version detection (v0.10.5) detection of updated/installed libraries now works properly after build --- support/functions/_plugin_update_toolchain | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/support/functions/_plugin_update_toolchain b/support/functions/_plugin_update_toolchain index 6f2e84e..818dd01 100755 --- a/support/functions/_plugin_update_toolchain +++ b/support/functions/_plugin_update_toolchain @@ -3,7 +3,7 @@ #simplebuild_plugin tcupdate tcupdate(){ - pversion="0.10.5"; + pversion="0.10.6"; pname="s3.TUP"; pdesc="Plugin $pname v$pversion"; configname="$configdir/plugin_update_toolchain.config"; @@ -119,7 +119,7 @@ tcupdate(){ [ -f "$tccfgdir/$tc" ] && source "$tccfgdir/$tc"; cd "$tcdir/$tc/bin"; - #autodetect toolchain's sysroot, prefix, include, pkgconfig folder + #autodetect toolchain's sysroot, prefix, include compilername="$_compiler""gcc";compilername=$(realpath -s $compilername); ranlibname="$_compiler""ranlib";ranlibname=$(realpath -s $ranlibname); hostname=${_compiler%?}; @@ -133,12 +133,13 @@ tcupdate(){ cd "$tcdir/$tc/$_sysroot" fi; prefixdir="$PWD" - pkg=$(find * | grep -m1 "/pkgconfig") && pkgdir="$prefixdir/$pkg" || pkgdir="$prefixdir"; [ "$FLAG" == "1" ] && backxit=1 || backxit=$menu_close; unset menu_close; while [ ! $menu_close ] do + #autodetect toolchain's pkgconfig folder + pkg=$(find * | grep -m1 "/pkgconfig") && pkgdir="$prefixdir/$pkg" || pkgdir="$prefixdir"; cd "$prefixdir" #LIBRARY UPDATE MENU unset MENU_OPTIONS;COUNT=0;unset libs;