summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/devtool/ide_plugins/ide_code.py1
-rwxr-xr-xscripts/lib/devtool/ide_sdk.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/lib/devtool/ide_plugins/ide_code.py b/scripts/lib/devtool/ide_plugins/ide_code.py
index f44665ed87..d5e3a4f421 100644
--- a/scripts/lib/devtool/ide_plugins/ide_code.py
+++ b/scripts/lib/devtool/ide_plugins/ide_code.py
@@ -194,6 +194,7 @@ class IdeVSCode(IdeBase):
194 properties_dict["configurationProvider"] = "ms-vscode.cmake-tools" 194 properties_dict["configurationProvider"] = "ms-vscode.cmake-tools"
195 elif modified_recipe.build_tool is BuildTool.MESON: 195 elif modified_recipe.build_tool is BuildTool.MESON:
196 properties_dict["configurationProvider"] = "mesonbuild.mesonbuild" 196 properties_dict["configurationProvider"] = "mesonbuild.mesonbuild"
197 properties_dict["compilerPath"] = os.path.join(modified_recipe.staging_bindir_toolchain, modified_recipe.cxx.split()[0])
197 else: # no C/C++ build 198 else: # no C/C++ build
198 return 199 return
199 200
diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py
index 1467974480..b52b52ae73 100755
--- a/scripts/lib/devtool/ide_sdk.py
+++ b/scripts/lib/devtool/ide_sdk.py
@@ -345,6 +345,7 @@ class RecipeModified:
345 self.base_libdir = recipe_d.getVar('base_libdir') 345 self.base_libdir = recipe_d.getVar('base_libdir')
346 self.bblayers = recipe_d.getVar('BBLAYERS').split() 346 self.bblayers = recipe_d.getVar('BBLAYERS').split()
347 self.bpn = recipe_d.getVar('BPN') 347 self.bpn = recipe_d.getVar('BPN')
348 self.cxx = recipe_d.getVar('CXX')
348 self.d = recipe_d.getVar('D') 349 self.d = recipe_d.getVar('D')
349 self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD') 350 self.fakerootcmd = recipe_d.getVar('FAKEROOTCMD')
350 self.fakerootenv = recipe_d.getVar('FAKEROOTENV') 351 self.fakerootenv = recipe_d.getVar('FAKEROOTENV')
@@ -360,6 +361,8 @@ class RecipeModified:
360 recipe_d.getVar('RECIPE_SYSROOT')) 361 recipe_d.getVar('RECIPE_SYSROOT'))
361 self.recipe_sysroot_native = os.path.realpath( 362 self.recipe_sysroot_native = os.path.realpath(
362 recipe_d.getVar('RECIPE_SYSROOT_NATIVE')) 363 recipe_d.getVar('RECIPE_SYSROOT_NATIVE'))
364 self.staging_bindir_toolchain = os.path.realpath(
365 recipe_d.getVar('STAGING_BINDIR_TOOLCHAIN'))
363 self.staging_incdir = os.path.realpath( 366 self.staging_incdir = os.path.realpath(
364 recipe_d.getVar('STAGING_INCDIR')) 367 recipe_d.getVar('STAGING_INCDIR'))
365 self.strip_cmd = recipe_d.getVar('STRIP') 368 self.strip_cmd = recipe_d.getVar('STRIP')