diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-02-04 09:08:36 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-02-16 08:24:58 -0800 |
commit | 6b79646f85f3293e0fbedf07592a94860d659053 (patch) | |
tree | 974c06cc6fb34b680ae9217d77c1c49645fc9393 /recipes-devtools/clang/clang_git.bb | |
parent | 03648d617e04ec46c227a52e35f5eff766f79814 (diff) | |
download | meta-clang-6b79646f85f3293e0fbedf07592a94860d659053.tar.gz |
clang: Upgrade to upcoming clang14 release branch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/clang_git.bb')
-rw-r--r-- | recipes-devtools/clang/clang_git.bb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb index 0201d44..b282d83 100644 --- a/recipes-devtools/clang/clang_git.bb +++ b/recipes-devtools/clang/clang_git.bb | |||
@@ -90,8 +90,8 @@ LLVM_ENABLE_RTTI;LLVM_ENABLE_EH;LLVM_BUILD_EXTERNAL_COMPILER_RT;CMAKE_SYSTEM_NAM | |||
90 | CMAKE_BUILD_TYPE;BUILD_SHARED_LIBS;LLVM_ENABLE_PROJECTS;LLVM_BINUTILS_INCDIR;\ | 90 | CMAKE_BUILD_TYPE;BUILD_SHARED_LIBS;LLVM_ENABLE_PROJECTS;LLVM_BINUTILS_INCDIR;\ |
91 | LLVM_TARGETS_TO_BUILD;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;PYTHON_EXECUTABLE;\ | 91 | LLVM_TARGETS_TO_BUILD;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;PYTHON_EXECUTABLE;\ |
92 | PYTHON_LIBRARY;PYTHON_INCLUDE_DIR;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;LLDB_EDITLINE_USE_WCHAR;\ | 92 | PYTHON_LIBRARY;PYTHON_INCLUDE_DIR;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;LLDB_EDITLINE_USE_WCHAR;\ |
93 | LLVM_ENABLE_LIBEDIT;LLDB_ENABLE_LIBEDIT;LLDB_PYTHON_RELATIVE_PATH;\ | 93 | LLVM_ENABLE_LIBEDIT;LLDB_ENABLE_LIBEDIT;LLDB_PYTHON_RELATIVE_PATH;LLDB_PYTHON_EXE_RELATIVE_PATH;\ |
94 | CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\ | 94 | LLDB_PYTHON_EXT_SUFFIX;CMAKE_C_FLAGS_RELEASE;CMAKE_CXX_FLAGS_RELEASE;CMAKE_ASM_FLAGS_RELEASE;\ |
95 | CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_UNWINDLIB;\ | 95 | CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;CLANG_DEFAULT_UNWINDLIB;\ |
96 | CLANG_DEFAULT_OPENMP_RUNTIME;\ | 96 | CLANG_DEFAULT_OPENMP_RUNTIME;\ |
97 | " | 97 | " |
@@ -116,6 +116,9 @@ LLDB:riscv64 = "" | |||
116 | LLDB:mips = "" | 116 | LLDB:mips = "" |
117 | LLDB:mipsel = "" | 117 | LLDB:mipsel = "" |
118 | 118 | ||
119 | # linux hosts (.so) on Windows .pyd | ||
120 | SOLIBSDEV:mingw32 = ".pyd" | ||
121 | |||
119 | #CMAKE_VERBOSE = "VERBOSE=1" | 122 | #CMAKE_VERBOSE = "VERBOSE=1" |
120 | 123 | ||
121 | EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ | 124 | EXTRA_OECMAKE += "-DLLVM_ENABLE_ASSERTIONS=OFF \ |
@@ -144,7 +147,10 @@ EXTRA_OECMAKE:append:class-native = "\ | |||
144 | " | 147 | " |
145 | EXTRA_OECMAKE:append:class-nativesdk = "\ | 148 | EXTRA_OECMAKE:append:class-nativesdk = "\ |
146 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 149 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ |
147 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \ | 150 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
151 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ | ||
152 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | ||
153 | -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-native.cmake' \ | ||
148 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ | 154 | -DCMAKE_RANLIB=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ranlib \ |
149 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ | 155 | -DCMAKE_AR=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-ar \ |
150 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ | 156 | -DCMAKE_NM=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}llvm-nm \ |
@@ -154,12 +160,16 @@ EXTRA_OECMAKE:append:class-nativesdk = "\ | |||
154 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | 160 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ |
155 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ | 161 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ |
156 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ | 162 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
163 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ | ||
164 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | ||
157 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ | 165 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ |
158 | -DPYTHON_EXECUTABLE='${PYTHON}' \ | 166 | -DPYTHON_EXECUTABLE='${PYTHON}' \ |
159 | " | 167 | " |
160 | EXTRA_OECMAKE:append:class-target = "\ | 168 | EXTRA_OECMAKE:append:class-target = "\ |
161 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ | 169 | -DCMAKE_CROSSCOMPILING:BOOL=ON \ |
162 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR}' \ | 170 | -DCROSS_TOOLCHAIN_FLAGS_NATIVE='-DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
171 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | ||
172 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON}' \ | ||
163 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ | 173 | -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ |
164 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ | 174 | -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ |
165 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ | 175 | -DLLDB_TABLEGEN=${STAGING_BINDIR_NATIVE}/lldb-tblgen \ |
@@ -171,6 +181,8 @@ EXTRA_OECMAKE:append:class-target = "\ | |||
171 | -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \ | 181 | -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS}${HF} \ |
172 | -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \ | 182 | -DLLVM_HOST_TRIPLE=${TARGET_SYS}${HF} \ |
173 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ | 183 | -DLLDB_PYTHON_RELATIVE_PATH=${PYTHON_SITEPACKAGES_DIR} \ |
184 | -DLLDB_PYTHON_EXE_RELATIVE_PATH=${PYTHON} \ | ||
185 | -DLLDB_PYTHON_EXT_SUFFIX=${SOLIBSDEV} \ | ||
174 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ | 186 | -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so \ |
175 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ | 187 | -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} \ |
176 | -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ | 188 | -DLLVM_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ |