Skip to content

Commit 285166e

Browse files
committed
Improve LLVM deps build
- Remove duplication in git clone code - Copy over the ability to check out a specific clang/lldb branch from kf/gallium
1 parent 21896a5 commit 285166e

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

deps/Makefile

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -583,36 +583,33 @@ ifneq ($(LLVM_LLDB_TAR),)
583583
mkdir -p llvm-$(LLVM_VER)/tools/lldb && \
584584
$(TAR) -C llvm-$(LLVM_VER)/tools/lldb --strip-components 1 -xf $(LLVM_LLDB_TAR)
585585
endif # LLVM_LLDB_TAR
586-
else
586+
else # LLVM_VER
587587
ifeq ($(BUILD_LLVM_CLANG),1)
588588
([ ! -d llvm-$(LLVM_VER)/tools/clang ] && \
589589
git clone $(LLVM_GIT_URL_CLANG) llvm-$(LLVM_VER)/tools/clang ) || \
590590
(cd llvm-$(LLVM_VER)/tools/clang && \
591591
git pull --ff-only)
592+
([ ! -d llvm-$(LLVM_VER)/projects/compiler-rt ] && \
593+
git clone $(LLVM_GIT_URL_COMPILER_RT) llvm-$(LLVM_VER)/projects/compiler-rt ) || \
594+
(cd llvm-$(LLVM_VER)/projects/compiler-rt && \
595+
git pull --ff-only)
596+
ifneq ($(LLVM_GIT_VER_CLANG),)
597+
(cd llvm-$(LLVM_VER)/tools/clang && \
598+
git checkout $(LLVM_GIT_VER_CLANG))
599+
endif # LLVM_GIT_VER_CLANG
592600
endif # BUILD_LLVM_CLANG
593601
ifeq ($(BUILD_LLDB),1)
594602
([ ! -d llvm-$(LLVM_VER)/tools/lldb ] && \
595603
git clone $(LLVM_GIT_URL_LLDB) llvm-$(LLVM_VER)/tools/lldb ) || \
596604
(cd llvm-$(LLVM_VER)/tools/lldb && \
597605
git pull --ff-only)
606+
ifneq ($(LLVM_GIT_VER_LLDB),)
607+
(cd $(LLVM_VER)/tools/lldb && \
608+
git checkout $(LLVM_GIT_VER_LLDB))
609+
endif # LLVM_GIT_VER_CLANG
598610
endif # BUILD_LLDB
599611
endif # LLVM_VER
600-
ifeq ($(LLVM_VER),svn)
601-
ifeq ($(BUILD_LLVM_CLANG),1)
602-
([ ! -d llvm-$(LLVM_VER)/tools/clang ] && \
603-
git clone $(LLVM_GIT_URL_CLANG) llvm-$(LLVM_VER)/tools/clang ) || \
604-
(cd llvm-$(LLVM_VER)/tools/clang && \
605-
git pull --ff-only)
606-
([ ! -d llvm-$(LLVM_VER)/projects/compiler-rt ] && \
607-
git clone $(LLVM_GIT_URL_COMPILER_RT) llvm-$(LLVM_VER)/projects/compiler-rt ) || \
608-
(cd llvm-$(LLVM_VER)/projects/compiler-rt && \
609-
git pull --ff-only)
610-
ifneq ($(LLVM_CLANG_VER),)
611-
(cd llvm-$(LLVM_VER) && \
612-
git checkout $(LLVM_GIT_VER))
613-
endif # LLVM_CLANG_VER
614-
endif # BUILD_LLVM_CLANG
615-
endif # LLVM_VER
612+
touch -c $@
616613

617614
# Apply version-specific LLVM patches
618615
ifeq ($(LLVM_VER),3.3)

0 commit comments

Comments
 (0)