Skip to content

Commit

Permalink
Manually finish conversion
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Jansa <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
shr-project authored and kraj committed Aug 3, 2021
1 parent 17737cc commit 953591e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ and OE will start using gcc to cross compile that recipe.
if a component does not build with libc++, you can add it to `conf/nonclangable.inc` e.g.

```shell
CXX:remove:pn-<recipe>_toolchain-clang = " -stdlib=libc++ "
CXX:remove:pn-<recipe>:toolchain-clang = " -stdlib=libc++ "
```

# compiler-rt failing in do_configure with custom TARGET_VENDOR
Expand Down
8 changes: 4 additions & 4 deletions classes/clang.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ LDFLAGS:append:toolchain-clang = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is
TOOLCHAIN ??= "gcc"
# choose between 'gnu' 'llvm'
RUNTIME ??= "gnu"
#RUNTIME_toolchain-gcc = "gnu"
#RUNTIME:toolchain-gcc = "gnu"
RUNTIME:armeb = "gnu"

TOOLCHAIN:class-native = "gcc"
Expand All @@ -84,8 +84,8 @@ OVERRIDES =. "${@['', 'toolchain-${TOOLCHAIN}:']['${TOOLCHAIN}' != '']}"
OVERRIDES =. "${@['', 'runtime-${RUNTIME}:']['${RUNTIME}' != '']}"
OVERRIDES[vardepsexclude] += "TOOLCHAIN RUNTIME"

#DEPENDS_append_toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
#DEPENDS_remove_toolchain-clang_allarch = "clang-cross-${TARGET_ARCH}"
#DEPENDS:append:toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
#DEPENDS:remove:toolchain-clang:allarch = "clang-cross-${TARGET_ARCH}"

def clang_base_deps(d):
if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
Expand All @@ -111,7 +111,7 @@ def clang_base_deps(d):
BASE_DEFAULT_DEPS:toolchain-clang:class-target = "${@clang_base_deps(d)}"
BASE_DEFAULT_DEPS:append:class-native:toolchain-clang_runtime-llvm = " libcxx-native compiler-rt-native"

cmake_do_generate_toolchain_file_append_toolchain-clang () {
cmake_do_generate_toolchain_file:append:toolchain-clang () {
cat >> ${WORKDIR}/toolchain.cmake <<EOF
set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy )
EOF
Expand Down
2 changes: 1 addition & 1 deletion classes/scan-build.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ SCAN_RESULTS_DIR ?= "${TMPDIR}/static-scan/${PN}"

CCSCAN ?= "${HOST_PREFIX}${TOOLCHAIN}"
CXXSCAN:toolchain-clang ?= "${HOST_PREFIX}clang++"
CXXSCAN_toolchain-gcc ?= "${HOST_PREFIX}g++"
CXXSCAN:toolchain-gcc ?= "${HOST_PREFIX}g++"

do_scanbuild() {
rm -rf ${SCAN_RESULTS_DIR}
Expand Down

0 comments on commit 953591e

Please sign in to comment.