DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-11-28 19:36:36 +03:00
Code Issues Projects Releases Wiki Activity

toolchain: v39 (#3793)

Browse Source 
* toolchain: v39
* vscode, sublime: re-enabled clangd binary from toolchain as language server
* Sublime project: update for toolchain v39

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
hedger 2024-07-30 05:30:25 +03:00 committed by GitHub
parent 360005c1d5
commit afc4e299a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.sublime-project vendored
View File

@ -10,10 +10,8 @@
"clangd": {
"enabled": true,
"initializationOptions": {
// Use with toolchain version 39+
// Set `"binary": "custom",` option in LSP-clangd config to use toolchain clangd
// "custom_command": ["toolchain/current/bin/clangd"],
"custom_command": ["toolchain/current/bin/clangd"],
"clangd.compile-commands-dir": "build/latest",
"clangd.header-insertion": "never",
"clangd.query-driver": "**/arm-none-eabi-*",

2
.vscode/example/settings.json.tmpl vendored
View File

@ -12,7 +12,7 @@
"SConstruct": "python",
"*.fam": "python"
},
// "clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
"clangd.path": "${workspaceFolder}/toolchain/current/bin/clangd@FBT_PLATFORM_EXECUTABLE_EXT@",
"clangd.arguments": [
"--query-driver=**/arm-none-eabi-*",
"--compile-commands-dir=${workspaceFolder}/build/latest",

2
scripts/toolchain/fbtenv.cmd
View File

@ -13,7 +13,7 @@ if not ["%FBT_NOENV%"] == [""] (
exit /b 0
)
set "FLIPPER_TOOLCHAIN_VERSION=38"
set "FLIPPER_TOOLCHAIN_VERSION=39"
if ["%FBT_TOOLCHAIN_PATH%"] == [""] (
set "FBT_TOOLCHAIN_PATH=%FBT_ROOT%"

2
scripts/toolchain/fbtenv.sh
View File

@ -4,7 +4,7 @@
# public variables
DEFAULT_SCRIPT_PATH="$(pwd -P)";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"38"}";
FBT_TOOLCHAIN_VERSION="${FBT_TOOLCHAIN_VERSION:-"39"}";
if [ -z ${FBT_TOOLCHAIN_PATH+x} ] ; then
FBT_TOOLCHAIN_PATH_WAS_SET=0;

2
scripts/ufbt/project_template/.vscode/settings.json vendored
View File

@ -19,7 +19,7 @@
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
},
// "clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
"clangd.path": "@UFBT_TOOLCHAIN_CLANGD@",
"clangd.arguments": [
"--query-driver=**/arm-none-eabi-*",
"--compile-commands-dir=${workspaceFolder}/.vscode",