diff --git a/konan/konan.properties b/konan/konan.properties index 17e8992289f..7bda4d7d46b 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -661,25 +661,25 @@ targetToolchain.macos_x64-wasm32 = target-toolchain-3-macos-wasm dependencies.macos_x64-wasm32 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos \ - target-sysroot-3-wasm \ + target-sysroot-4-embedded \ target-toolchain-3-macos-wasm targetToolchain.linux_x64-wasm32 = target-toolchain-2-linux-wasm dependencies.linux_x64-wasm32 = \ libffi-3.2.1-2-linux-x86-64 \ clang-llvm-8.0.0-linux-x86-64 \ - target-sysroot-3-wasm \ + target-sysroot-4-embedded \ target-toolchain-2-linux-wasm targetToolchain.mingw_x64-wasm32 = target-toolchain-2-mingw-wasm dependencies.mingw_x64-wasm32 = \ libffi-3.2.1-mingw-w64-x86-64 \ msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \ - target-sysroot-3-wasm \ + target-sysroot-4-embedded \ target-toolchain-2-mingw-wasm quadruple.wasm32 = wasm32-unknown-unknown -targetSysRoot.wasm32 = target-sysroot-3-wasm +targetSysRoot.wasm32 = target-sysroot-4-embedded clangFlags.wasm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.wasm32 = -O1 clangOptFlags.wasm32 = -O3 diff --git a/konan/platforms/zephyr/stm32f4_disco b/konan/platforms/zephyr/stm32f4_disco index 0d0a55d4eca..b00158ef8e1 100644 --- a/konan/platforms/zephyr/stm32f4_disco +++ b/konan/platforms/zephyr/stm32f4_disco @@ -18,7 +18,7 @@ # STM32 F4 Discovery quadruple.zephyr_stm32f4_disco = armv7m-none-eabi -targetSysRoot.zephyr_stm32f4_disco = target-sysroot-3-wasm +targetSysRoot.zephyr_stm32f4_disco = target-sysroot-4-embedded boardSpecificClangFlags.zephyr_stm32f4_disco = -mthumb targetCpu.zephyr_stm32f4_disco = cortex-m4 @@ -30,18 +30,18 @@ dependencies.linux_x64-zephyr_stm32f4_disco = \ libffi-3.2.1-2-linux-x86-64 \ clang-llvm-8.0.0-linux-x86-64 \ gcc-arm-none-eabi-7-2017-q4-major-linux \ - target-sysroot-3-wasm + target-sysroot-4-embedded targetToolchain.macos_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-mac/arm-none-eabi dependencies.macos_x64-zephyr_stm32f4_disco = \ gcc-arm-none-eabi-7-2017-q4-major-mac \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos \ - target-sysroot-3-wasm + target-sysroot-4-embedded targetToolchain.mingw_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-win32/arm-none-eabi dependencies.mingw_x64-zephyr_stm32f4_disco = \ libffi-3.2.1-mingw-w64-x86-64 \ msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \ gcc-arm-none-eabi-7-2017-q4-major-win32 \ - target-sysroot-3-wasm + target-sysroot-4-embedded