From 211c303461be655d49ddcff42f0907cfc6d03824 Mon Sep 17 00:00:00 2001 From: Enguerrand de Ribaucourt Date: Thu, 22 Feb 2024 11:29:56 +0100 Subject: Revert "meson: use absolute cross-compiler paths" This reverts commit fc8e5d7c13f62e987b76971116cf290fd01a0c8f. We need to use the absolute path to the compiler so that the VSCode configuration generated by devtool ide-sdk could lint meson projects. A feature was just added to vscode-cpptools to support conveying the compilerPath in addition to the compile_commands.json. The next commits adds the necessary configuration. We can revert this one and keep the meson paths as they were. (From OE-Core rev: 9c2faa835bd7af3e6f6bd7cc08495bd4b3ca9d0b) Signed-off-by: Enguerrand de Ribaucourt Signed-off-by: Richard Purdie --- meta/classes-recipe/meson-routines.bbclass | 6 ------ meta/classes-recipe/meson.bbclass | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'meta') diff --git a/meta/classes-recipe/meson-routines.bbclass b/meta/classes-recipe/meson-routines.bbclass index 9925465ed8..a944a8fff1 100644 --- a/meta/classes-recipe/meson-routines.bbclass +++ b/meta/classes-recipe/meson-routines.bbclass @@ -10,12 +10,6 @@ def meson_array(var, d): items = d.getVar(var).split() return repr(items[0] if len(items) == 1 else items) -def meson_array_abspath(var, d): - import shutil - items = d.getVar(var).split() - items[0] = shutil.which(items[0]) or items[0] - return repr(items[0] if len(items) == 1 else items) - # Map our ARCH values to what Meson expects: # http://mesonbuild.com/Reference-tables.html#cpu-families def meson_cpu_family(var, d): diff --git a/meta/classes-recipe/meson.bbclass b/meta/classes-recipe/meson.bbclass index 31675cf42d..03fa2c06eb 100644 --- a/meta/classes-recipe/meson.bbclass +++ b/meta/classes-recipe/meson.bbclass @@ -64,13 +64,10 @@ addtask write_config before do_configure do_write_config[vardeps] += "CC CXX AR NM STRIP READELF OBJCOPY CFLAGS CXXFLAGS LDFLAGS RUSTC RUSTFLAGS EXEWRAPPER_ENABLED" do_write_config() { # This needs to be Py to split the args into single-element lists - # The generated compile_commands.json file can be used by external IDEs - # which do not know the $PATH set-up by bitbake. They need the absolute - # compiler paths. cat >${WORKDIR}/meson.cross <