summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/llvm/llvm_git.bb5
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index d362bd76c6..4a6d4da5d5 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ QEMUVERSION ?= "6.2%"
26GOVERSION ?= "1.17%" 26GOVERSION ?= "1.17%"
27# This can not use wildcards like 8.0.% since it is also used in mesa to denote 27# This can not use wildcards like 8.0.% since it is also used in mesa to denote
28# llvm version being used, so always bump it with llvm recipe version bump 28# llvm version being used, so always bump it with llvm recipe version bump
29LLVMVERSION ?= "13.0.1" 29LLVMVERSION ?= "14.0.0"
30RUSTVERSION ?= "1.59%" 30RUSTVERSION ?= "1.59%"
31 31
32PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 9400bf0821..13f7fb763e 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,7 +19,7 @@ inherit cmake pkgconfig
19 19
20PROVIDES += "llvm${PV}" 20PROVIDES += "llvm${PV}"
21 21
22PV = "13.0.1" 22PV = "14.0.0"
23 23
24MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}" 24MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
25 25
@@ -27,7 +27,7 @@ LLVM_RELEASE = "${PV}"
27LLVM_DIR = "llvm${LLVM_RELEASE}" 27LLVM_DIR = "llvm${LLVM_RELEASE}"
28 28
29BRANCH = "release/${MAJOR_VERSION}.x" 29BRANCH = "release/${MAJOR_VERSION}.x"
30SRCREV = "75e33f71c2dae584b13a7d1186ae0a038ba98838" 30SRCREV = "329fda39c507e8740978d10458451dcdb21563be"
31SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \ 31SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \
32 file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \ 32 file://0006-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch;striplevel=2 \
33 file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ 33 file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
@@ -145,7 +145,6 @@ do_install() {
145do_install:class-native() { 145do_install:class-native() {
146 install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} 146 install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
147 install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} 147 install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV}
148 install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so
149} 148}
150 149
151PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" 150PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto"