diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-09-21 10:20:50 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-09-21 15:22:28 -0700 |
commit | e1868700ad2278f7863dc8c427058cf160441253 (patch) | |
tree | b826efca6f6837cd0b1d064e574d4f2d60f0265f /recipes-devtools | |
parent | 5f325ff8119d2ea8229e42955c3e43309915f6bf (diff) | |
download | meta-clang-e1868700ad2278f7863dc8c427058cf160441253.tar.gz |
clang: Do not package tablegen built during cross-compile
These tools are only needed during build and we are using them from
clang-native, so they are not needed to be either built or packages in
nativesdk-clang or target clang builds
Fixes Issue #859
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools')
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 69a63a4..4239806 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -155,7 +155,6 @@ EXTRA_OECMAKE:append:class-native = "\ | |||
155 | -DPYTHON_EXECUTABLE='${PYTHON}' \ | 155 | -DPYTHON_EXECUTABLE='${PYTHON}' \ |
156 | " | 156 | " |
157 | EXTRA_OECMAKE:append:class-nativesdk = "\ | 157 | EXTRA_OECMAKE:append:class-nativesdk = "\ |
158 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | ||
159 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ | 158 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
160 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ | 159 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ |
161 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | 160 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ |
@@ -164,13 +163,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ | |||
164 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ | 163 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ |
165 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ | 164 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ |
166 | -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \ | 165 | -DCMAKE_STRIP=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-strip \ |
167 | -DLLVM_USE_HOST_TOOLS=OFF \ | 166 | -DLLVM_NATIVE_TOOL_DIR=${STAGING_BINDIR_NATIVE} \ |
168 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config \ | ||
169 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
170 | -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | ||
171 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ | ||
172 | -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${STAGING_BINDIR_NATIVE}/clang-tidy-confusable-chars-gen \ | ||
173 | -DCLANG_PSEUDO_GEN=${STAGING_BINDIR_NATIVE}/clang-pseudo-gen \ | ||
174 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ | 167 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ |
175 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ | 168 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
176 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ | 169 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ |
@@ -179,14 +172,7 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ | |||
179 | -DPYTHON_EXECUTABLE='${PYTHON}' \ | 172 | -DPYTHON_EXECUTABLE='${PYTHON}' \ |
180 | " | 173 | " |
181 | EXTRA_OECMAKE:append:class-target = "\ | 174 | EXTRA_OECMAKE:append:class-target = "\ |
182 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 175 | -DLLVM_NATIVE_TOOL_DIR=${STAGING_BINDIR_NATIVE} \ |
183 | -DLLVM_USE_HOST_TOOLS=OFF \ | ||
184 | -DLLVM_CONFIG_PATH=${STAGING_BINDIR_NATIVE}/llvm-config \ | ||
185 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | ||
186 | -DLLDB_TABLEGEN_EXE=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | ||
187 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ | ||
188 | -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${STAGING_BINDIR_NATIVE}/clang-tidy-confusable-chars-gen \ | ||
189 | -DCLANG_PSEUDO_GEN=${STAGING_BINDIR_NATIVE}/clang-pseudo-gen \ | ||
190 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ | 176 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ |
191 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ | 177 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ |
192 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ | 178 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ |
@@ -266,7 +252,6 @@ do_install:append:class-native () { | |||
266 | do_install:append:class-nativesdk () { | 252 | do_install:append:class-nativesdk () { |
267 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen | 253 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tblgen ${D}${bindir}/clang-tblgen |
268 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-pseudo-gen ${D}${bindir}/clang-pseudo-gen | 254 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-pseudo-gen ${D}${bindir}/clang-pseudo-gen |
269 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/lldb-tblgen ${D}${bindir}/lldb-tblgen | ||
270 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tidy-confusable-chars-gen ${D}${bindir}/clang-tidy-confusable-chars-gen | 255 | install -Dm 0755 ${B}${BINPATHPREFIX}/bin/clang-tidy-confusable-chars-gen ${D}${bindir}/clang-tidy-confusable-chars-gen |
271 | for f in `find ${D}${bindir} -executable -type f -not -type l`; do | 256 | for f in `find ${D}${bindir} -executable -type f -not -type l`; do |
272 | test -n "`file -b $f|grep -i ELF`" && ${STRIP} $f | 257 | test -n "`file -b $f|grep -i ELF`" && ${STRIP} $f |