diff --git a/deps/llvm-options.mk b/deps/llvm-options.mk
index 2ba3809614d472..a917d63de72055 100644
--- a/deps/llvm-options.mk
+++ b/deps/llvm-options.mk
@@ -19,17 +19,3 @@ else
 LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+ASAN
 endif
 endif
-
-
-ifeq ($(LLVM_VER),svn)
-LLVM_BARESRC_DIR:=$(SRCCACHE)/llvm-project-bare
-LLVM_MONOSRC_DIR:=$(SRCCACHE)/llvm-project-$(LLVM_VER)-${LLVM_GIT_VER}
-LLVM_SRC_DIR:=$(LLVM_MONOSRC_DIR)/llvm
-LIBCXX_ROOT_DIR:=$(LLVM_MONOSRC_DIR)
-else
-LLVM_MONOSRC_DIR:=
-LLVM_SRC_DIR:=$(SRCCACHE)/llvm-$(LLVM_VER)
-LIBCXX_ROOT_DIR:=$(LLVM_SRC_DIR)/projects
-endif
-LLVM_BUILD_DIR:=$(BUILDDIR)/llvm-$(LLVM_VER)
-LLVM_BUILDDIR_withtype := $(LLVM_BUILD_DIR)/build_$(LLVM_BUILDTYPE)
diff --git a/deps/llvm.mk b/deps/llvm.mk
index dc106faffb71d5..34de34f72f24c1 100644
--- a/deps/llvm.mk
+++ b/deps/llvm.mk
@@ -1,12 +1,14 @@
 ## LLVM ##
 include $(SRCDIR)/llvm-ver.make
+include $(SRCDIR)/llvm-options.mk
 
 ifneq ($(USE_BINARYBUILDER_LLVM), 1)
-ifeq ($(USE_UPSTREAM_LLVM), 1)
-LLVM_GIT_URL ?= https://github.com/llvm/llvm-project.git
-else
-LLVM_GIT_URL ?= https://github.com/JuliaLang/llvm-project.git
-end
+LLVM_GIT_URL:=git://github.com/JuliaLang/llvm-project.git
+LLVM_TAR_URL=https://api.github.com/repos/JuliaLang/llvm-project/tarball/$1
+$(eval $(call git-external,llvm,LLVM,CMakeLists.txt,,$(SRCCACHE)))
+
+LLVM_BUILDDIR := $(BUILDDIR)/$(LLVM_SRC_DIR)
+LLVM_BUILDDIR_withtype := $(LLVM_BUILDDIR)/build_$(LLVM_BUILDTYPE)
 
 ifeq ($(BUILD_LLDB), 1)
 BUILD_LLVM_CLANG := 1
@@ -18,27 +20,11 @@ BUILD_LLVM_CLANG := 1
 # because it's a build requirement
 endif
 
-
-ifeq ($(USE_SYSTEM_LLVM),0)
-ifneq ($(LLVM_VER),svn)
-ifeq ($(USE_POLLY),1)
-$(error USE_POLLY=1 requires LLVM_VER=svn)
-endif
-
-ifeq ($(USE_MLIR),1)
-$(error USE_MLIR=1 requires LLVM_VER=svn)
-endif
-
-ifeq ($(USE_RV),1)
-$(error USE_RV=1 requires LLVM_VER=svn)
-endif
-endif
-endif
-
-ifneq ($(USE_RV),)
-LLVM_RV_GIT_URL ?= https://github.com/cdl-saarland/rv
-LLVM_RV_GIT_VER ?= release_90
-endif
+# TODO: Add RV support back in
+# ifneq ($(USE_RV),)
+# LLVM_RV_GIT_URL ?= https://github.com/cdl-saarland/rv
+# LLVM_RV_GIT_VER ?= release_90
+# endif
 
 
 # for Monorepo
@@ -60,41 +46,8 @@ ifeq ($(USE_RV), 1)
 LLVM_EXTERNAL_PROJECTS := $(LLVM_EXTERNAL_PROJECTS);rv
 endif
 
-include $(SRCDIR)/llvm-options.mk
 LLVM_LIB_FILE := libLLVMCodeGen.a
 
-ifeq (,$(findstring rc,$(LLVM_VER)))
-LLVM_TAR_EXT:=$(LLVM_VER).src.tar.xz
-else
-LLVM_VER_SPLIT := $(subst -rc, ,$(LLVM_VER))
-LLVM_TAR_EXT:=$(word 1,$(LLVM_VER_SPLIT))rc$(word 2,$(LLVM_VER_SPLIT)).src.tar.xz
-endif
-
-ifneq ($(LLVM_VER),svn)
-LLVM_TAR:=$(SRCCACHE)/llvm-$(LLVM_TAR_EXT)
-
-ifeq ($(BUILD_LLDB),1)
-LLVM_LLDB_TAR:=$(SRCCACHE)/lldb-$(LLVM_TAR_EXT)
-endif # BUILD_LLDB
-
-ifeq ($(BUILD_LLVM_CLANG),1)
-ifeq ($(LLVM_VER_MAJ).$(LLVM_VER_MIN),9.0)
-LLVM_CLANG_TAR:=$(SRCCACHE)/cfe-$(LLVM_TAR_EXT)
-else
-LLVM_CLANG_TAR:=$(SRCCACHE)/clang-$(LLVM_TAR_EXT)
-endif
-LLVM_COMPILER_RT_TAR:=$(SRCCACHE)/compiler-rt-$(LLVM_TAR_EXT)
-else
-LLVM_CLANG_TAR:=
-LLVM_COMPILER_RT_TAR:=
-LLVM_LIBCXX_TAR:=
-endif # BUILD_LLVM_CLANG
-
-ifeq ($(BUILD_CUSTOM_LIBCXX),1)
-LLVM_LIBCXX_TAR:=$(SRCCACHE)/libcxx-$(LLVM_TAR_EXT)
-endif
-endif # LLVM_VER != svn
-
 # Figure out which targets to build
 LLVM_TARGETS := host;NVPTX;AMDGPU;WebAssembly;BPF
 
@@ -105,7 +58,6 @@ LLVM_LDFLAGS :=
 LLVM_CMAKE :=
 
 # MONOREPO
-ifeq ($(LLVM_VER),svn)
 LLVM_CMAKE += -DLLVM_ENABLE_PROJECTS="$(LLVM_ENABLE_PROJECTS)"
 LLVM_CMAKE += -DLLVM_EXTERNAL_PROJECTS="$(LLVM_EXTERNAL_PROJECTS)"
 
@@ -113,7 +65,6 @@ ifeq ($(USE_RV),1)
 LLVM_CMAKE += -DLLVM_EXTERNAL_RV_SOURCE_DIR=$(LLVM_MONOSRC_DIR)/rv
 LLVM_CMAKE += -DLLVM_CXX_STD=c++14
 endif
-endif
 
 # Allow adding LLVM specific flags
 LLVM_CFLAGS += $(CFLAGS)
@@ -239,37 +190,6 @@ ifeq ($(BUILD_LLDB),0)
 LLVM_CMAKE += -DLLVM_TOOL_LLDB_BUILD=OFF
 endif
 
-ifneq ($(LLVM_VER),svn)
-LLVM_SRC_URL := https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_VER)
-
-ifneq ($(LLVM_CLANG_TAR),)
-$(LLVM_CLANG_TAR): | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ $(LLVM_SRC_URL)/$(notdir $@)
-endif
-ifneq ($(LLVM_COMPILER_RT_TAR),)
-$(LLVM_COMPILER_RT_TAR): | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ $(LLVM_SRC_URL)/$(notdir $@)
-endif
-
-ifneq ($(LLVM_LIBCXX_TAR),)
-$(LLVM_LIBCXX_TAR): | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ $(LLVM_SRC_URL)/$(notdir $@)
-endif
-ifneq ($(LLVM_VER),svn)
-$(LLVM_TAR): | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ $(LLVM_SRC_URL)/$(notdir $@)
-endif
-
-ifneq ($(LLVM_LLDB_TAR),)
-$(LLVM_LLDB_TAR): | $(SRCCACHE)
-	$(JLDOWNLOAD) $@ $(LLVM_SRC_URL)/$(notdir $@)
-endif
-ifeq ($(BUILD_LLDB),1)
-$(LLVM_SRC_DIR)/tools/lldb:
-$(LLVM_SRC_DIR)/source-extracted: $(LLVM_SRC_DIR)/tools/lldb
-endif
-endif
-
 # LLDB still relies on plenty of python 2.x infrastructure, without checking
 llvm_python_location=$(shell /usr/bin/env python2 -c 'import sys; print(sys.executable)')
 llvm_python_workaround=$(SRCCACHE)/python2_path
@@ -362,106 +282,58 @@ LIBCXX_DEPENDENCY := $(build_libdir)/libc++abi.so.1.0 $(build_libdir)/libc++.so.
 get-llvm: get-libcxx get-libcxxabi
 endif
 
-checksum-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
-ifneq ($(LLVM_CLANG_TAR),)
-	$(JLCHECKSUM) $(LLVM_CLANG_TAR)
-endif
-ifneq ($(LLVM_COMPILER_RT_TAR),)
-	$(JLCHECKSUM) $(LLVM_COMPILER_RT_TAR)
-endif
-ifneq ($(LLVM_LIBCXX_TAR),)
-	$(JLCHECKSUM) $(LLVM_LIBCXX_TAR)
-endif
-ifneq ($(LLVM_VER),svn)
-	$(JLCHECKSUM) $(LLVM_TAR)
-endif
-ifneq ($(LLVM_LLDB_TAR),)
-	$(JLCHECKSUM) $(LLVM_LLDB_TAR)
-endif
-
-$(LLVM_SRC_DIR)/source-extracted: | $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
-ifneq ($(LLVM_CLANG_TAR),)
-	$(JLCHECKSUM) $(LLVM_CLANG_TAR)
-endif
-ifneq ($(LLVM_COMPILER_RT_TAR),)
-	$(JLCHECKSUM) $(LLVM_COMPILER_RT_TAR)
-endif
-ifneq ($(LLVM_LIBCXX_TAR),)
-	$(JLCHECKSUM) $(LLVM_LIBCXX_TAR)
-endif
-ifneq ($(LLVM_VER),svn)
-	$(JLCHECKSUM) $(LLVM_TAR)
-endif
-ifneq ($(LLVM_LLDB_TAR),)
-	$(JLCHECKSUM) $(LLVM_LLDB_TAR)
-endif
-	-rm -rf $(LLVM_SRC_DIR)
-ifneq ($(LLVM_VER),svn)
-	mkdir -p $(LLVM_SRC_DIR)
-	$(TAR) -C $(LLVM_SRC_DIR) --strip-components 1 -xf $(LLVM_TAR)
-else
-	([ ! -d $(LLVM_BARESRC_DIR) ] && \
-		git clone --bare $(LLVM_GIT_URL) $(LLVM_BARESRC_DIR) ) || \
-		(cd $(LLVM_BARESRC_DIR) && \
-		git fetch)
-	([ ! -d $(LLVM_MONOSRC_DIR) ] && \
-		git clone --dissociate --reference $(LLVM_BARESRC_DIR) $(LLVM_GIT_URL) $(LLVM_MONOSRC_DIR) ) || \
-		(cd $(LLVM_MONOSRC_DIR) && \
-		git pull --ff-only)
-ifneq ($(LLVM_GIT_VER),)
-	(cd $(LLVM_MONOSRC_DIR) && \
-		git checkout $(LLVM_GIT_VER))
-endif # LLVM_GIT_VER
-	# Debug output only. Disable pager and ignore error.
-	(cd $(LLVM_SRC_DIR) && \
-		git show HEAD --stat | cat) || true
-ifeq ($(USE_RV),1)
-	git clone -b $(LLVM_RV_GIT_VER) $(LLVM_RV_GIT_URL) $(LLVM_MONOSRC_DIR)/rv
-	(cd $(LLVM_MONOSRC_DIR)/rv && \
-		git submodule update --init) || true
-endif
-endif # LLVM_VER
-ifneq ($(LLVM_VER),svn)
-ifneq ($(LLVM_CLANG_TAR),)
-	mkdir -p $(LLVM_SRC_DIR)/tools/clang
-	$(TAR) -C $(LLVM_SRC_DIR)/tools/clang --strip-components 1 -xf $(LLVM_CLANG_TAR)
-endif # LLVM_CLANG_TAR
-ifneq ($(LLVM_COMPILER_RT_TAR),)
-	mkdir -p $(LLVM_SRC_DIR)/projects/compiler-rt
-	$(TAR) -C $(LLVM_SRC_DIR)/projects/compiler-rt --strip-components 1 -xf $(LLVM_COMPILER_RT_TAR)
-endif # LLVM_COMPILER_RT_TAR
-ifneq ($(LLVM_LLDB_TAR),)
-	mkdir -p $(LLVM_SRC_DIR)/tools/lldb
-	$(TAR) -C $(LLVM_SRC_DIR)/tools/lldb --strip-components 1 -xf $(LLVM_LLDB_TAR)
-endif # LLVM_LLDB_TAR
-endif # LLVM_VER
-	# touch some extra files to ensure bisect works pretty well
-	touch -c $(LLVM_SRC_DIR).extracted
-	touch -c $(LLVM_SRC_DIR)/configure
-	touch -c $(LLVM_SRC_DIR)/CMakeLists.txt
-	echo 1 > $@
+# checksum-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
+# ifneq ($(LLVM_CLANG_TAR),)
+# 	$(JLCHECKSUM) $(LLVM_CLANG_TAR)
+# endif
+# ifneq ($(LLVM_COMPILER_RT_TAR),)
+# 	$(JLCHECKSUM) $(LLVM_COMPILER_RT_TAR)
+# endif
+# ifneq ($(LLVM_LIBCXX_TAR),)
+# 	$(JLCHECKSUM) $(LLVM_LIBCXX_TAR)
+# endif
+# ifneq ($(LLVM_VER),svn)
+# 	$(JLCHECKSUM) $(LLVM_TAR)
+# endif
+# ifneq ($(LLVM_LLDB_TAR),)
+# 	$(JLCHECKSUM) $(LLVM_LLDB_TAR)
+# endif
+
+# $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted: $(LLVM_SRC_FILE)
+# 	# Debug output only. Disable pager and ignore error.
+# 	(cd $(LLVM_SRC_DIR) && \
+# 		git show HEAD --stat | cat) || true
+# # ifeq ($(USE_RV),1)
+# # 	git clone -b $(LLVM_RV_GIT_VER) $(LLVM_RV_GIT_URL) $(LLVM_MONOSRC_DIR)/rv
+# # 	(cd $(LLVM_MONOSRC_DIR)/rv && \
+# # 		git submodule update --init) || true
+# # endif
+# 	# touch some extra files to ensure bisect works pretty well
+# 	touch -c $(SRCCACHE)/$(LLVM_SRC_DIR).extracted
+# 	touch -c $(LLVM_SRC_DIR)$(SRCCACHE)/$(LLVM_SRC_DIR)/configure
+# 	touch -c $(LLVM_SRC_DIR)$(SRCCACHE)/$(LLVM_SRC_DIR)/CMakeLists.txt
+# 	echo 1 > $@
 
 # Apply version-specific LLVM patches sequentially
 LLVM_PATCH_PREV :=
 define LLVM_PATCH
-$$(LLVM_SRC_DIR)/$1.patch-applied: $$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
-	cd $$(LLVM_SRC_DIR) && patch -p1 < $$(SRCDIR)/patches/$1.patch
+$$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
+	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR)/llvm && patch -p1 < $$(SRCDIR)/patches/$1.patch
 	echo 1 > $$@
 # declare that applying any patch must re-run the compile step
-$$(LLVM_BUILDDIR_withtype)/build-compiled: $$(LLVM_SRC_DIR)/$1.patch-applied
-LLVM_PATCH_PREV := $$(LLVM_SRC_DIR)/$1.patch-applied
+$$(LLVM_BUILDDIR_withtype)/build-compiled: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
+LLVM_PATCH_PREV := $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
 endef
 
 define LLVM_PROJ_PATCH
-$$(LLVM_SRC_DIR)/$1.patch-applied: $$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
-	cd $$(LLVM_SRC_DIR) && patch -p2 < $$(SRCDIR)/patches/$1.patch
+$$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/source-extracted | $$(SRCDIR)/patches/$1.patch $$(LLVM_PATCH_PREV)
+	cd $$(SRCCACHE)/$$(LLVM_SRC_DIR) && patch -p1 < $$(SRCDIR)/patches/$1.patch
 	echo 1 > $$@
 # declare that applying any patch must re-run the compile step
-$$(LLVM_BUILDDIR_withtype)/build-compiled: $$(LLVM_SRC_DIR)/$1.patch-applied
-LLVM_PATCH_PREV := $$(LLVM_SRC_DIR)/$1.patch-applied
+$$(LLVM_BUILDDIR_withtype)/build-compiled: $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
+LLVM_PATCH_PREV := $$(SRCCACHE)/$$(LLVM_SRC_DIR)/$1.patch-applied
 endef
 
-ifeq ($(USE_LLVM_UPSTREAM), 1)
 ifeq ($(LLVM_VER_SHORT),11.0)
 ifeq ($(LLVM_VER_PATCH), 0)
 $(eval $(call LLVM_PATCH,llvm-D27629-AArch64-large_model_6.0.1)) # remove for LLVM 12
@@ -504,39 +376,7 @@ $(eval $(call LLVM_PROJ_PATCH,llvm-11-D97571-AArch64-loh)) # remove for LLVM 13
 $(eval $(call LLVM_PROJ_PATCH,llvm-11-aarch64-addrspace)) # remove for LLVM 13
 endif # LLVM_VER 11.0
 
-ifeq ($(LLVM_VER_SHORT),12.0)
-$(eval $(call LLVM_PATCH,llvm7-revert-D44485)) # Needs upstreaming
-$(eval $(call LLVM_PATCH,llvm-12-D75072-SCEV-add-type))
-$(eval $(call LLVM_PATCH,llvm-julia-tsan-custom-as))
-ifeq ($(BUILD_LLVM_CLANG),1)
-$(eval $(call LLVM_PATCH,llvm-D88630-clang-cmake))
-endif
-$(eval $(call LLVM_PATCH,llvm-invalid-addrspacecast-sink)) # Still being upstreamed as D92210
-$(eval $(call LLVM_PATCH,llvm-11-D93154-globalisel-as))
-$(eval $(call LLVM_PATCH,llvm-11-D94813-mergeicmps)) # remove for LLVM 14
-$(eval $(call LLVM_PROJ_PATCH,llvm-11-AArch64-FastIsel-bug))
-$(eval $(call LLVM_PATCH,llvm-12-D97435-AArch64-movaddrreg))
-$(eval $(call LLVM_PROJ_PATCH,llvm-11-D97571-AArch64-loh)) # remove for LLVM 13
-$(eval $(call LLVM_PROJ_PATCH,llvm-11-aarch64-addrspace)) # remove for LLVM 13
-$(eval $(call LLVM_PROJ_PATCH,llvm-12-fde-symbols-aarch64)) # remove for LLVM 13
-$(eval $(call LLVM_PROJ_PATCH,llvm-12-force-eh_frame-aarch64)) # remove for LLVM 13
-$(eval $(call LLVM_PROJ_PATCH,llvm-12-D109203-stackprobe-x86)) # remove for LLVM 13
-endif # LLVM_VER 12.0
-
-ifeq ($(LLVM_VER_SHORT),13.0)
-$(eval $(call LLVM_PATCH,llvm7-revert-D44485)) # Needs upstreaming
-# $(eval $(call LLVM_PROJ_PATCH,llvm-13-D75072-SCEV-add-type)) # Should no longer be necessary
-$(eval $(call LLVM_PATCH,llvm-julia-tsan-custom-as))
-ifeq ($(BUILD_LLVM_CLANG),1)
-$(eval $(call LLVM_PATCH,llvm-D88630-clang-cmake))
-endif
-$(eval $(call LLVM_PATCH,llvm-invalid-addrspacecast-sink)) # Still being upstreamed as D92210
-$(eval $(call LLVM_PATCH,llvm-11-D93154-globalisel-as))
-$(eval $(call LLVM_PATCH,llvm-11-D94813-mergeicmps)) # remove for LLVM 14
-$(eval $(call LLVM_PATCH,llvm-13-AArch64-FastIsel-bug))
-$(eval $(call LLVM_PATCH,llvm-13-D97435-AArch64-movaddrreg))
-endif # LLVM_VER 13.0
-endif # USE_LLVM_UPSTREAM
+# NOTE: LLVM 12 and 13 have their patches applied to JuliaLang/llvm-project
 
 # Add a JL prefix to the version map. DO NOT REMOVE
 ifneq ($(LLVM_VER), svn)
@@ -546,11 +386,11 @@ endif
 # declare that all patches must be applied before running ./configure
 $(LLVM_BUILDDIR_withtype)/build-configured: | $(LLVM_PATCH_PREV)
 
-$(LLVM_BUILDDIR_withtype)/build-configured: $(LLVM_SRC_DIR)/source-extracted | $(llvm_python_workaround) $(LIBCXX_DEPENDENCY)
+$(LLVM_BUILDDIR_withtype)/build-configured: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted | $(llvm_python_workaround) $(LIBCXX_DEPENDENCY)
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
 		export PATH=$(llvm_python_workaround):"$$PATH" && \
-		$(CMAKE) $(LLVM_SRC_DIR) $(CMAKE_GENERATOR_COMMAND) $(CMAKE_COMMON) $(LLVM_CMAKE) \
+		$(CMAKE) $(SRCCACHE)/$(LLVM_SRC_DIR)/llvm $(CMAKE_GENERATOR_COMMAND) $(CMAKE_COMMON) $(LLVM_CMAKE) \
 		|| { echo '*** To install a newer version of cmake, run contrib/download_cmake.sh ***' && false; }
 	echo 1 > $@
 
@@ -591,18 +431,19 @@ clean-llvm: clean-libcxx clean-libcxxabi
 	-rm $(LLVM_BUILDDIR_withtype)/build-configured $(LLVM_BUILDDIR_withtype)/build-compiled
 	-$(MAKE) -C $(LLVM_BUILDDIR_withtype) clean
 
-distclean-llvm: distclean-libcxx distclean-libcxxabi
-	-rm -rf $(LLVM_TAR) $(LLVM_CLANG_TAR) \
-		$(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR) \
-		$(LLVM_SRC_DIR) $(LLVM_BUILDDIR_withtype)
+# distclean-llvm: distclean-libcxx distclean-libcxxabi
+# 	-rm -rf $(LLVM_TAR) $(LLVM_CLANG_TAR) \
+# 		$(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR) \
+# 		$(LLVM_SRC_DIR) $(LLVM_BUILDDIR_withtype)
 
 
-ifneq ($(LLVM_VER),svn)
-get-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
-else
-get-llvm: $(LLVM_SRC_DIR)/source-extracted
-endif
-extract-llvm: $(LLVM_SRC_DIR)/source-extracted
+# ifneq ($(LLVM_VER),svn)
+# get-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
+# else
+# get-llvm: $(LLVM_SRC_DIR)/source-extracted
+# endif
+get-llvm: $(LLVM_SRC_FILE)
+extract-llvm: $(SRCCACHE)/$(LLVM_SRC_DIR)/source-extracted
 configure-llvm: $(LLVM_BUILDDIR_withtype)/build-configured
 compile-llvm: $(LLVM_BUILDDIR_withtype)/build-compiled
 fastcheck-llvm: #none
diff --git a/deps/llvm.version b/deps/llvm.version
new file mode 100644
index 00000000000000..07bf32e4ff54b7
--- /dev/null
+++ b/deps/llvm.version
@@ -0,0 +1,3 @@
+LLVM_BRANCH=julia-12.0.1-3
+LLVM_SHA1=8f6e49e8a3c0f31a55c342a2a41dda630508c5eb
+