Skip to content

Commit 22d203f

Browse files
authored
add support for JuliaLang/llvm-project (#42505)
(cherry picked from commit ab3c6e5)
1 parent 76b30f0 commit 22d203f

15 files changed

+48
-2016
lines changed

Make.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ BUILD_LLVM_CLANG := 0
332332
# set to 1 to get lldb (often does not work, no chance with llvm3.2 and earlier)
333333
# see http://lldb.llvm.org/build.html for dependencies
334334
BUILD_LLDB := 0
335+
BUILD_LIBCXX := 0
335336

336337
# Options to enable Polly and its code-generation options
337338
USE_POLLY := 0
@@ -1360,6 +1361,7 @@ endif
13601361

13611362
# Custom libcxx
13621363
ifeq ($(BUILD_CUSTOM_LIBCXX),1)
1364+
$(error BUILD_CUSTOM_LIBCXX is currently not supported, BUILD_LIBCXX will provide LIBCXX but not link it)
13631365
LDFLAGS += -L$(build_libdir)
13641366
CXXLDFLAGS += -L$(build_libdir) -lc++abi -lc++
13651367
ifeq ($(USECLANG),1)

contrib/refresh_checksums.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ all: checksum-doc-unicodedata
9898

9999
# Special LLVM source hashes for optional targets
100100
checksum-llvm-special-src:
101-
-+$(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
101+
-+$(MAKE) $(QUIET_MAKE) -C "$(JULIAHOME)/deps" USE_BINARYBUILDER_LLVM=0 DEPS_GIT=0 checksum-llvm
102102
all: checksum-llvm-special-src
103103
.PHONY: checksum-llvm-special-src
104104

deps/checksums/llvm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,5 @@ libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx03.tar.gz/md5/21f09693ee068d6882c
230230
libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx03.tar.gz/sha512/cff5601bf70bfdce22cc416ea8ceb469a7e14c02d759ce505b52cd9f9f9579397a9fbb446749bd1e2c3dd7556d221949c0ff13892764d5e71efcb890cf5da40e
231231
libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx11.tar.gz/md5/eae391563d980dd469071072c1ddcf47
232232
libLLVM_assert.v12.0.1+2.x86_64-w64-mingw32-cxx11.tar.gz/sha512/32cc745a2225f8fefd1d466d6ada7411c9ec2fd5454f79c393e38dec383c4e46ec183e9b8f8acabfaeaf8dd335a4a76fad28bdee0f056e0d314c572fab36fb0f
233-
llvm-12.0.1.src.tar.xz/md5/72a257604efa1d32ef85a37cd9c66873
234-
llvm-12.0.1.src.tar.xz/sha512/ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f
233+
llvm-julia-12.0.1-3.tar.gz/md5/6aa35f64f20f338647b25bb5b4c7e48e
234+
llvm-julia-12.0.1-3.tar.gz/sha512/45ae103a6992fe71cc28eec638eb4c765b5601f7a42a857ce31daaae6e126f8a72b05f417696f612051431505fd833a40d7455cbd50f6d210c8195d0cc4bc9d1

deps/llvm-options.mk

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,3 @@ else
1919
LLVM_BUILDTYPE := $(LLVM_BUILDTYPE)+ASAN
2020
endif
2121
endif
22-
23-
24-
ifeq ($(LLVM_VER),svn)
25-
LLVM_BARESRC_DIR:=$(SRCCACHE)/llvm-project-bare
26-
LLVM_MONOSRC_DIR:=$(SRCCACHE)/llvm-project-$(LLVM_VER)-${LLVM_GIT_VER}
27-
LLVM_SRC_DIR:=$(LLVM_MONOSRC_DIR)/llvm
28-
LIBCXX_ROOT_DIR:=$(LLVM_MONOSRC_DIR)
29-
else
30-
LLVM_MONOSRC_DIR:=
31-
LLVM_SRC_DIR:=$(SRCCACHE)/llvm-$(LLVM_VER)
32-
LIBCXX_ROOT_DIR:=$(LLVM_SRC_DIR)/projects
33-
endif
34-
LLVM_BUILD_DIR:=$(BUILDDIR)/llvm-$(LLVM_VER)
35-
LLVM_BUILDDIR_withtype := $(LLVM_BUILD_DIR)/build_$(LLVM_BUILDTYPE)

0 commit comments

Comments
 (0)