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

Merge branch 'feature/gcc_8_msys_update_simple' into 'master'

update MSYS package for esp32-2019r1 toolchain

See merge request idf/esp-idf!5199
Angus Gratton 6 лет назад
Родитель
Сommit
9bca2f878a

+ 1 - 1
docs/en/get-started/windows-setup.rst

@@ -14,7 +14,7 @@ Toolchain Setup
 
 
 The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com:
 The quick setup is to download the Windows all-in-one toolchain & MSYS2 zip file from dl.espressif.com:
 
 
-https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20181001.zip
+https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20190611.zip
 
 
 Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment.
 Unzip the zip file to ``C:\`` (or some other location, but this guide assumes ``C:\``) and it will create an ``msys32`` directory with a pre-prepared environment.
 
 

+ 1 - 1
docs/zh_CN/get-started/windows-setup.rst

@@ -15,7 +15,7 @@ Windows 没有内置的 "make" 环境,因此如果要安装工具链,你需
 
 
 快速设置的方法是从 dl.espressif.com 下载集成在一起的工具链和 MSYS2 压缩文件:
 快速设置的方法是从 dl.espressif.com 下载集成在一起的工具链和 MSYS2 压缩文件:
 
 
-https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20181001.zip
+https://dl.espressif.com/dl/esp32_win32_msys2_environment_and_toolchain-20190611.zip
 
 
 将 zip 压缩文件解压到 ``C:\`` (或其它路径,这里假设是 ``C:\``),它会使用预先准备的环境创建一个 ``msys32`` 目录。
 将 zip 压缩文件解压到 ``C:\`` (或其它路径,这里假设是 ``C:\``),它会使用预先准备的环境创建一个 ``msys32`` 目录。
 
 

+ 2 - 1
tools/windows/windows_install_prerequisites.sh

@@ -42,10 +42,11 @@ if [ -n "$IDF_PATH" ]; then
 fi
 fi
 
 
 # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
 # Automatically download precompiled toolchain, unpack at /opt/xtensa-esp32-elf/
-TOOLCHAIN_ZIP=xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip
+TOOLCHAIN_ZIP=xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-win32.zip
 echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
 echo "Downloading precompiled toolchain ${TOOLCHAIN_ZIP}..."
 cd ~
 cd ~
 curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
 curl -LO --retry 10 http://dl.espressif.com/dl/${TOOLCHAIN_ZIP}
+mkdir -p /opt
 cd /opt
 cd /opt
 rm -rf /opt/xtensa-esp32-elf  # for upgrades
 rm -rf /opt/xtensa-esp32-elf  # for upgrades
 unzip ~/${TOOLCHAIN_ZIP}
 unzip ~/${TOOLCHAIN_ZIP}