diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2025-03-25 10:31:35 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-04-01 07:01:31 -0700 |
| commit | 950413c8cdefb7d8c7a3c6621b34821b714ce321 (patch) | |
| tree | 5c889df0d621ef6955cdb42688c4081723f74e22 /dynamic-layers/meta-python | |
| parent | 3d977ae12610c2732bf50fa3ecf6aed614490041 (diff) | |
| download | meta-clang-950413c8cdefb7d8c7a3c6621b34821b714ce321.tar.gz | |
compiler-rt: remove the LLVM_LIBDIR_SUFFIX conditional
since the upgrade to 20 it's installed in nonarch_libdir even when
multilib is used and LLVM_LIBDIR_SUFFIX is set to '32'.
I don't know if some people are setting LLVM_LIBDIR_SUFFIX in some
more creative way where this won't work, but with the default:
LLVM_LIBDIR_SUFFIX="${@d.getVar('baselib').replace('lib', '')}"
we don't seem to need this conditional, which actually breaks the
build now when the 'else' branch is used.
fixes:
http://errors.yoctoproject.org/Errors/Details/850268/
mv: cannot stat 'lib32-compiler-rt/20.1.1/image/usr/lib32/linux': No such file or directory
No change for build without multilib and compared with 19 most notably
include/orc/c_api.h is no longer included in {libdir}/clang/<version>:
$ find tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/libclang_rt.builtins-x86_64.a
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/liborc_rt-x86_64.a
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include/orc
tmp/work/core2-64-oe-linux/compiler-rt/20.1.1.after/image/usr/include/orc/c_api.h
$ find tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/libclang_rt.builtins-x86_64.a
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/liborc_rt-x86_64.a
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc
tmp/work/core2-64-oe-linux/compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc/c_api.h
for lib32-compiler-rt:
$ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/lib/linux/libclang_rt.builtins-i386.a
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/19.1.7/image/usr/lib/clang/19.1.7/include/orc/c_api.h
$ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/linux
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/linux/libclang_rt.builtins-i386.a
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang/20.1.1
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/lib/clang/20.1.1/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include/orc
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.before/image/usr/include/orc/c_api.h
this is where it failed because there is no /usr/lib32/clang
$ find tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/lib/clang/20.1.1/lib/linux/libclang_rt.builtins-i386.a
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include/orc
tmp/work/i586-oemllib32-linux/lib32-compiler-rt/20.1.1.after/image/usr/include/orc/c_api.h
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Diffstat (limited to 'dynamic-layers/meta-python')
0 files changed, 0 insertions, 0 deletions