diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-01-12 19:18:51 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-02-22 01:10:31 -0800 |
commit | 464230f0007e94beb2ca03018553ebcb18b0a569 (patch) | |
tree | c87eb1889c186b4cae4d0492d698ce87b23e3b1e | |
parent | e97e68b5734cb096d76de6609072eefccc338d0a (diff) | |
download | meta-clang-464230f0007e94beb2ca03018553ebcb18b0a569.tar.gz |
clang: Pass LLVM_CONFIG_PATH to target and nativesdk builds
This ensures that it does not end up building NATIVE tools
and using them during build, which obviously wont work when
buildhost != targethost or iow cross-compiling
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 52c3575..7098ddc 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -97,6 +97,7 @@ LLVM_ENABLE_LIBEDIT;LLDB_ENABLE_LIBEDIT;LLDB_PYTHON_RELATIVE_PATH;LLDB_PYTHON_EX | |||
97 | LLDB_PYTHON_EXT_SUFFIX;CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\ | 97 | LLDB_PYTHON_EXT_SUFFIX;CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\ |
98 | CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_UNWINDLIB;\ | 98 | CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_UNWINDLIB;\ |
99 | CLANG_DEFAULT_OPENMP_RUNTIME;LLVM_ENABLE_PER_TARGET_RUNTIME_DIR;\ | 99 | CLANG_DEFAULT_OPENMP_RUNTIME;LLVM_ENABLE_PER_TARGET_RUNTIME_DIR;\ |
100 | LLVM_BUILD_TOOLS;LLVM_USE_HOST_TOOLS;LLVM_CONFIG_PATH;\ | ||
100 | " | 101 | " |
101 | # | 102 | # |
102 | # Default to build all OE-Core supported target arches (user overridable). | 103 | # Default to build all OE-Core supported target arches (user overridable). |
@@ -163,6 +164,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ | |||
163 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ | 164 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ |
164 | -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \ | 165 | -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \ |
165 | -DLLVM_USE_HOST_TOOLS=OFF \ | 166 | -DLLVM_USE_HOST_TOOLS=OFF \ |
167 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config \ | ||
166 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | 168 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ |
167 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | 169 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ |
168 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ | 170 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ |
@@ -178,6 +180,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ | |||
178 | EXTRA_OECMAKE:append:class-target = "\ | 180 | EXTRA_OECMAKE:append:class-target = "\ |
179 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 181 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ |
180 | -DLLVM_USE_HOST_TOOLS=OFF \ | 182 | -DLLVM_USE_HOST_TOOLS=OFF \ |
183 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config \ | ||
181 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | 184 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ |
182 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | 185 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ |
183 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ | 186 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ |