helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-08-13 14:36:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "meson: use absolute cross-compiler paths"

Browse Source 
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>
This commit is contained in:
Enguerrand de Ribaucourt 2024-02-22 11:29:56 +01:00 committed by Richard Purdie
parent e2f8ed72dd
commit 211c303461
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes-recipe/meson-routines.bbclass
View File

@ -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):

7
meta/classes-recipe/meson.bbclass
View File

@ -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 <<EOF
[binaries]
c = ${@meson_array_abspath('CC', d)}
cpp = ${@meson_array_abspath('CXX', d)}
c = ${@meson_array('CC', d)}
cpp = ${@meson_array('CXX', d)}
cython = 'cython3'
ar = ${@meson_array('AR', d)}
nm = ${@meson_array('NM', d)}