diff options
author | Enguerrand de Ribaucourt <enguerrand.de-ribaucourt@savoirfairelinux.com> | 2024-02-22 11:29:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-23 14:29:03 +0000 |
commit | 211c303461be655d49ddcff42f0907cfc6d03824 (patch) | |
tree | 204a4ec4d505dc758f8ba7b57c15d22f7362e930 /meta/classes-recipe/meson-routines.bbclass | |
parent | e2f8ed72dd4dc01e2d3a9ce7b1debc0015c623c2 (diff) | |
download | poky-211c303461be655d49ddcff42f0907cfc6d03824.tar.gz |
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 <enguerrand.de-ribaucourt@savoirfairelinux.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe/meson-routines.bbclass')
-rw-r--r-- | meta/classes-recipe/meson-routines.bbclass | 6 |
1 files changed, 0 insertions, 6 deletions
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): | |||
10 | items = d.getVar(var).split() | 10 | items = d.getVar(var).split() |
11 | return repr(items[0] if len(items) == 1 else items) | 11 | return repr(items[0] if len(items) == 1 else items) |
12 | 12 | ||
13 | def meson_array_abspath(var, d): | ||
14 | import shutil | ||
15 | items = d.getVar(var).split() | ||
16 | items[0] = shutil.which(items[0]) or items[0] | ||
17 | return repr(items[0] if len(items) == 1 else items) | ||
18 | |||
19 | # Map our ARCH values to what Meson expects: | 13 | # Map our ARCH values to what Meson expects: |
20 | # http://mesonbuild.com/Reference-tables.html#cpu-families | 14 | # http://mesonbuild.com/Reference-tables.html#cpu-families |
21 | def meson_cpu_family(var, d): | 15 | def meson_cpu_family(var, d): |