diff options
| author | Khem Raj <raj.khem@gmail.com> | 2022-09-11 22:13:43 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-09-12 10:51:30 -0700 |
| commit | 0ad6be9324bc16716ecd0b7fbbcbfd1e4aa5fc2c (patch) | |
| tree | bb5911edeca828d464906fa75932474b32112326 /recipes-devtools | |
| parent | 444dde06ed249ade3966cf9d72cd79a918d56734 (diff) | |
| download | meta-clang-0ad6be9324bc16716ecd0b7fbbcbfd1e4aa5fc2c.tar.gz | |
compiler-rt-sanitizers: Fix arm builds
With clang-15, it exposed an error building, where it is trying to link
with libgcc even when llvm unwninder is available in distro. Therefore
use DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON, other options are to match the
recipe with compiler-rt recipe.
Fix missing option -DCOMPILER_RT_ENABLE_STATIC_UNWINDER when building
with static libcxx
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools')
| -rw-r--r-- | recipes-devtools/clang/compiler-rt-sanitizers_git.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb index 67cf5a3..0444839 100644 --- a/recipes-devtools/clang/compiler-rt-sanitizers_git.bb +++ b/recipes-devtools/clang/compiler-rt-sanitizers_git.bb | |||
| @@ -21,7 +21,7 @@ DEPENDS:append:class-nativesdk = " clang-native clang-crosssdk-${SDK_ARCH} nativ | |||
| 21 | 21 | ||
| 22 | PACKAGECONFIG ??= "" | 22 | PACKAGECONFIG ??= "" |
| 23 | PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF" | 23 | PACKAGECONFIG[crt] = "-DCOMPILER_RT_BUILD_CRT:BOOL=ON,-DCOMPILER_RT_BUILD_CRT:BOOL=OFF" |
| 24 | PACKAGECONFIG[static-libcxx] = "-DSANITIZER_USE_STATIC_CXX_ABI=ON -DSANITIZER_USE_STATIC_LLVM_UNWINDER=ON,," | 24 | PACKAGECONFIG[static-libcxx] = "-DSANITIZER_USE_STATIC_CXX_ABI=ON -DSANITIZER_USE_STATIC_LLVM_UNWINDER=ON -DCOMPILER_RT_ENABLE_STATIC_UNWINDER=ON,," |
| 25 | 25 | ||
| 26 | HF = "" | 26 | HF = "" |
| 27 | HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" | 27 | HF:class-target = "${@ bb.utils.contains('TUNE_CCARGS_MFLOAT', 'hard', 'hf', '', d)}" |
| @@ -33,7 +33,9 @@ OECMAKE_SOURCEPATH = "${S}/llvm" | |||
| 33 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ | 33 | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ |
| 34 | -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ | 34 | -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \ |
| 35 | -DCOMPILER_RT_STANDALONE_BUILD=OFF \ | 35 | -DCOMPILER_RT_STANDALONE_BUILD=OFF \ |
| 36 | -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \ | 36 | -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ |
| 37 | -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \ | ||
| 38 | -DCMAKE_C_COMPILER_TARGET=${HOST_ARCH}${HF}${HOST_VENDOR}-${HOST_OS} \ | ||
| 37 | -DCOMPILER_RT_BUILD_BUILTINS=OFF \ | 39 | -DCOMPILER_RT_BUILD_BUILTINS=OFF \ |
| 38 | -DSANITIZER_CXX_ABI_LIBNAME=${@bb.utils.contains("RUNTIME", "llvm", "libc++", "libstdc++", d)} \ | 40 | -DSANITIZER_CXX_ABI_LIBNAME=${@bb.utils.contains("RUNTIME", "llvm", "libc++", "libstdc++", d)} \ |
| 39 | -DCOMPILER_RT_BUILD_XRAY=ON \ | 41 | -DCOMPILER_RT_BUILD_XRAY=ON \ |