Merge pull request #42436 from JuliaLang/vc/jl_llvm

add support for JuliaLang/llvm-project

Author: vchuravy

Make.inc

@@ -335,6 +335,7 @@ BUILD_LLVM_CLANG := 0
 # set to 1 to get lldb (often does not work, no chance with llvm3.2 and earlier)
 # see http://lldb.llvm.org/build.html for dependencies
 BUILD_LLDB := 0
+BUILD_LIBCXX := 0
 
 # Options to enable Polly and its code-generation options
 USE_POLLY := 0
@@ -1370,6 +1371,7 @@ endif
 
 # Custom libcxx
 ifeq ($(BUILD_CUSTOM_LIBCXX),1)
+$(error BUILD_CUSTOM_LIBCXX is currently not supported, BUILD_LIBCXX will provide LIBCXX but not link it)
 LDFLAGS += -L$(build_libdir)
 CXXLDFLAGS += -L$(build_libdir) -lc++abi -lc++
 ifeq ($(USECLANG),1)

contrib/refresh_checksums.mk

@@ -98,7 +98,7 @@ all: checksum-doc-unicodedata
 
 # Special LLVM source hashes for optional targets
 checksum-llvm-special-src:
-	-+$(MAKE) $(QUIET_MAKE) -C "$(JULIAHOME)/deps" USE_BINARYBUILDER_LLVM=0 DEPS_GIT=0 BUILD_LLDB=1 BUILD_LLVM_CLANG=1 BUILD_CUSTOM_LIBCXX=1 USECLANG=1 checksum-llvm
+	-+$(MAKE) $(QUIET_MAKE) -C "$(JULIAHOME)/deps" USE_BINARYBUILDER_LLVM=0 DEPS_GIT=0 checksum-llvm
 all: checksum-llvm-special-src
 .PHONY: checksum-llvm-special-src
 

deps/checksums/llvm

@@ -230,5 +230,5 @@ libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx03.tar.gz/md5/21f09693ee068d6882c
 libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx03.tar.gz/sha512/cff5601bf70bfdce22cc416ea8ceb469a7e14c02d759ce505b52cd9f9f9579397a9fbb446749bd1e2c3dd7556d221949c0ff13892764d5e71efcb890cf5da40e
 libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx11.tar.gz/md5/eae391563d980dd469071072c1ddcf47
 libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx11.tar.gz/sha512/32cc745a2225f8fefd1d466d6ada7411c9ec2fd5454f79c393e38dec383c4e46ec183e9b8f8acabfaeaf8dd335a4a76fad28bdee0f056e0d314c572fab36fb0f
-llvm-12.0.1.src.tar.xz/md5/72a257604efa1d32ef85a37cd9c66873
-llvm-12.0.1.src.tar.xz/sha512/ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f
+llvm-julia-12.0.1-3.tar.gz/md5/6aa35f64f20f338647b25bb5b4c7e48e
+llvm-julia-12.0.1-3.tar.gz/sha512/45ae103a6992fe71cc28eec638eb4c765b5601f7a42a857ce31daaae6e126f8a72b05f417696f612051431505fd833a40d7455cbd50f6d210c8195d0cc4bc9d1

deps/llvm-options.mk

@@ -23,17 +23,3 @@ ifeq ($(SANITIZE_THREAD),1)
 LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+TSAN
 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)