summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-05-18 09:56:02 -0700
committerKhem Raj <raj.khem@gmail.com>2017-05-18 09:56:02 -0700
commitc312b19b342d8957e8ea949f53bc1af98f0ae12b (patch)
treea936dd951d15c015a427d75b0e01ae7670397fa2
parent6e875230563120453beb132a4ac910d1cf8bb840 (diff)
downloadmeta-clang-c312b19b342d8957e8ea949f53bc1af98f0ae12b.tar.gz
clang: Change LLVM_TARGETS_TO_BUILD to build everything by default
As described in issue #33, LLVM_TARGETS_TO_BUILD should include build host as well as target arches and that fails since we build clang-native once for all due to its inherent cross compilable nature if one needs to limit the targets please set it in local.conf or via a bbappend in own layer e.g. LLVM_TARGETS_TO_BUILD = "ARM" if you only need 32bit arm or LLVM_TARGETS_TO_BUILD = "ARM;Aarch64" in case of both arm 32bit and 64bit fixes #33 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-devtools/clang/clang_git.bb17
1 files changed, 9 insertions, 8 deletions
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 839fa15..e35736e 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -10,11 +10,6 @@ require clang.inc
10 10
11PV .= "+git${SRCPV}" 11PV .= "+git${SRCPV}"
12 12
13#
14# Default to building only required targets (user overridable).
15#
16LLVM_TARGETS_TO_BUILD ?= "${@get_clang_host_arch(bb, d)};${@get_clang_target_arch(bb, d)}"
17
18LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \ 13LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=${LLVMMD5SUM}; \
19 file://tools/clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \ 14 file://tools/clang/LICENSE.TXT;md5=${CLANGMD5SUM}; \
20 " 15 "
@@ -59,6 +54,7 @@ def get_clang_arch(bb, d, arch_var):
59 "arm" : "ARM", 54 "arm" : "ARM",
60 "arm64" : "AArch64", 55 "arm64" : "AArch64",
61 "aarch64" : "AArch64", 56 "aarch64" : "AArch64",
57 "riscv" : "RISCV",
62 } 58 }
63 59
64 if target_arch in clang_arches: 60 if target_arch in clang_arches:
@@ -77,6 +73,11 @@ PACKAGECONFIG_class-native = ""
77 73
78PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,compiler-rt" 74PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,compiler-rt"
79PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx" 75PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx"
76#
77# Default to build all OE-Core supported target arches (user overridable).
78#
79LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;Mips;PowerPC;X86"
80LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb, d)};${@get_clang_target_arch(bb, d)}"
80 81
81EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \ 82EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \
82 -DLLVM_ENABLE_FFI=False \ 83 -DLLVM_ENABLE_FFI=False \
@@ -86,10 +87,10 @@ EXTRA_OECMAKE="-DLLVM_ENABLE_RTTI=True \
86" 87"
87 88
88EXTRA_OECMAKE_append_class-native = "\ 89EXTRA_OECMAKE_append_class-native = "\
89 -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD}" \ 90 -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
90" 91"
91EXTRA_OECMAKE_append_class-nativesdk = "\ 92EXTRA_OECMAKE_append_class-nativesdk = "\
92 -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD}" \ 93 -DLLVM_TARGETS_TO_BUILD='${LLVM_TARGETS_TO_BUILD}' \
93 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ 94 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
94 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ 95 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
95" 96"
@@ -99,7 +100,7 @@ EXTRA_OECMAKE_append_class-target = "\
99 -DLLVM_ENABLE_PIC=ON \ 100 -DLLVM_ENABLE_PIC=ON \
100 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \ 101 -DLLVM_TABLEGEN=${STAGING_BINDIR_NATIVE}/llvm-tblgen \
101 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \ 102 -DCLANG_TABLEGEN=${STAGING_BINDIR_NATIVE}/clang-tblgen \
102 -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS_TO_BUILD}" \ 103 -DLLVM_TARGETS_TO_BUILD=${@get_clang_target_arch(bb, d)} \
103 -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \ 104 -DLLVM_TARGET_ARCH=${@get_clang_target_arch(bb, d)} \
104 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS} \ 105 -DLLVM_DEFAULT_TARGET_TRIPLE=${TARGET_SYS} \
105" 106"