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.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 105a879f3a..7afe28a160 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -26,7 +26,7 @@ QEMUVERSION ?= "6.0%"
26GOVERSION ?= "1.16%" 26GOVERSION ?= "1.16%"
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 ?= "12.0.0" 29LLVMVERSION ?= "12.0.1"
30 30
31PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 31PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
32PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index de79adc410..4554b752eb 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 = "12.0.0" 22PV = "12.0.1"
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 = "fa0971b87fb2c9d14d1bba2551e61f02f18f329b" 30SRCREV = "fed41342a82f5a3a9201819a82bf7a48313e296b"
31SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \ 31SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH} \
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 \