Просмотр исходного кода

Toolchain 20 rollback (#2410)

* Toolchain rollback
* Remove extra code
Max Andreev 2 лет назад
Родитель
Сommit
c7fbc8323b
2 измененных файлов с 2 добавлено и 5 удалено
  1. 1 1
      scripts/toolchain/fbtenv.cmd
  2. 1 4
      scripts/toolchain/fbtenv.sh

+ 1 - 1
scripts/toolchain/fbtenv.cmd

@@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
     exit /b 0
 )
 
-set "FLIPPER_TOOLCHAIN_VERSION=20"
+set "FLIPPER_TOOLCHAIN_VERSION=19"
 
 if ["%FBT_TOOLCHAIN_ROOT%"] == [""] (
     set "FBT_TOOLCHAIN_ROOT=%FBT_ROOT%\toolchain\x86_64-windows"

+ 1 - 4
scripts/toolchain/fbtenv.sh

@@ -5,7 +5,7 @@
 # public variables
 DEFAULT_SCRIPT_PATH="$(pwd -P)";
 SCRIPT_PATH="${SCRIPT_PATH:-$DEFAULT_SCRIPT_PATH}";
-FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"20"}";
+FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"19"}";
 FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
 FBT_VERBOSE="${FBT_VERBOSE:-""}";
 
@@ -292,9 +292,6 @@ fbtenv_main()
     fbtenv_check_download_toolchain || return 1;
     fbtenv_set_shell_prompt;
     fbtenv_print_version;
-    if [ "$SYS_TYPE" = "Linux" ]; then
-        export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
-    fi
     PATH="$TOOLCHAIN_ARCH_DIR/python/bin:$PATH";
     PATH="$TOOLCHAIN_ARCH_DIR/bin:$PATH";
     PATH="$TOOLCHAIN_ARCH_DIR/protobuf/bin:$PATH";