Use a tarball instead of git for checking out LLDB.

jiahao · Nov 19, 2014 · d00ba77 · d00ba77
1 parent b5f762c
commit d00ba77
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -274,6 +274,12 @@ LLVM_FLAGS += --disable-threads
 endif
 
 ifeq ($(BUILD_LLDB),1)
+ifeq ($(LLVM_VER), 3.5.0)
+LLVM_LLDB_TAR=lldb-$(LLVM_VER).src.tar.xz
+else
+LLVM_LLDB_TAR=lldb-$(LLVM_VER).src.tar.gz
+endif
+
 ifeq ($(USECLANG),1)
 LLVM_FLAGS += --enable-cxx11
 else
@@ -338,22 +344,33 @@ $(LLVM_TAR):
  $(JLDOWNLOAD) $@ http:https://llvm.org/releases/$(LLVM_VER)/$@
 endif
 
+ifneq ($(LLVM_LLDB_TAR),)
+$(LLVM_LLDB_TAR):
+ $(JLDOWNLOAD) $@ http:https://llvm.org/releases/$(LLVM_VER)/$@
+endif
 ifeq ($(BUILD_LLDB),1)
 llvm-$(LLVM_VER)/tools/lldb:
 llvm-$(LLVM_VER)/configure: llvm-$(LLVM_VER)/tools/lldb
 endif
 
-ifeq ($(LLVM_VER), 3.2)
-## LLVM needs python 2.x, but doesn't check for it, so we have to use an ugly workaround to make it compile
 llvm-$(LLVM_VER)/python2_path:
  mkdir -p llvm-$(LLVM_VER)/python2_path
  -python -c 'import sys; sys.exit(not sys.version_info > (3, 0))' && \
  /usr/bin/python2 -c 'import sys; sys.exit(not sys.version_info < (3, 0))' && \
+ ln -sf /usr/bin/python2-config "llvm-$(LLVM_VER)/python2_path/python-config"
+ -python -c 'import sys; sys.exit(not sys.version_info > (3, 0))' && \
+ /usr/bin/python2 -c 'import sys; sys.exit(not sys.version_info < (3, 0))' && \
  ln -sf /usr/bin/python2 "llvm-$(LLVM_VER)/python2_path/python"
+ifeq ($(LLVM_VER), 3.2)
+## LLVM needs python 2.x, but doesn't check for it, so we have to use an ugly workaround to make it compile
 llvm_python_workaround=llvm-$(LLVM_VER)/python2_path
 else
  LLVM_FLAGS += --with-python="$(shell ./find_python2)"
 endif
+# LLDB still relies on plenty of python 2.x infrastructure, without checking
+ifeq ($(BUILD_LLDB),1)
+llvm_python_workaround=llvm-$(LLVM_VER)/python2_path
+endif
 
 ifeq ($(BUILD_CUSTOM_LIBCXX),1)
 
@@ -417,6 +434,9 @@ endif
 ifneq ($(LLVM_VER),svn)
  $(JLCHECKSUM) $(LLVM_TAR)
 endif
+ifneq ($(LLVM_LLDB_TAR),)
+ $(JLCHECKSUM) $(LLVM_LLDB_TAR)
+endif
 ifneq ($(LLVM_VER),svn)
  mkdir -p llvm-$(LLVM_VER) && \
  $(TAR) -C llvm-$(LLVM_VER) --strip-components 1 -xf $(LLVM_TAR)
@@ -439,13 +459,25 @@ ifneq ($(LLVM_COMPILER_RT_TAR),)
  mkdir -p llvm-$(LLVM_VER)/projects/compiler-rt && \
  $(TAR) -C llvm-$(LLVM_VER)/projects/compiler-rt --strip-components 1 -xf $(LLVM_COMPILER_RT_TAR)
 endif
+ifneq ($(LLVM_LLDB_TAR),)
+ mkdir -p llvm-$(LLVM_VER)/tools/lldb && \
+ $(TAR) -C llvm-$(LLVM_VER)/tools/lldb --strip-components 1 -xf $(LLVM_LLDB_TAR)
+ # LLDB 3.5: with python, rename python-config to python2-config in 2 Makefiles
+ # without python, remove scripts/Python subdir of tools/lldb
+endif
 else
 ifeq ($(BUILD_LLVM_CLANG),1)
  ([ ! -d llvm-$(LLVM_VER)/tools/clang ] && \
  git clone $(LLVM_GIT_URL_CLANG) llvm-$(LLVM_VER)/tools/clang ) || \
  (cd llvm-$(LLVM_VER)/tools/clang && \
  git pull --ff-only)
 endif
+ifeq ($(BUILD_LLDB),1)
+ ([ ! -d llvm-$(LLVM_VER)/tools/lldb ] && \
+ git clone $(LLVM_GIT_URL_LLDB) llvm-$(LLVM_VER)/tools/lldb ) || \
+ (cd llvm-$(LLVM_VER)/tools/lldb && \
+ git pull --ff-only)
+endif
 endif
 ifeq ($(LLVM_VER),svn)
 ifeq ($(BUILD_LLVM_CLANG),1)
@@ -464,15 +496,6 @@ endif
 endif
 endif
 
-ifeq ($(BUILD_LLDB),1)
- ([ ! -d llvm-$(LLVM_VER)/tools/lldb ] && \
- (cd llvm-$(LLVM_VER)/tools && \
- git clone $(LLVM_GIT_URL_LLDB))) || \
- ([ -d llvm-$(LLVM_VER)/tools/lldb ] && \
- (cd llvm-$(LLVM_VER)/tools/lldb && \
- git fetch))
- cd llvm-$(LLVM_VER)/tools/lldb && git checkout $(LLDB_VER)
-endif
 ifeq ($(LLVM_VER),3.3)
  patch -p0 < llvm-3.3.patch
  patch -p0 < instcombine-llvm-3.3.patch
@@ -526,7 +549,7 @@ distclean-llvm:
  -rm -rf llvm-$(LLVM_VER).tar.gz llvm-$(LLVM_VER).src.tar.gz clang-$(LLVM_VER).src.tar.gz clang-$(LLVM_VER).tar.gz libcxx-$(LLVM_VER).src.tar.gz compiler-rt-$(LLVM_VER).src.tar.gz llvm-$(LLVM_VER)
 
 ifneq ($(LLVM_VER),svn)
-get-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR)
+get-llvm: $(LLVM_TAR) $(LLVM_CLANG_TAR) $(LLVM_COMPILER_RT_TAR) $(LLVM_LIBCXX_TAR) $(LLVM_LLDB_TAR)
 else
 get-llvm: llvm-$(LLVM_VER)/configure $(LIBCXX_GET_DEPENDENCY)
 endif

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -1,6 +1,5 @@
 LLVM_VER = 3.3
 LLVM_LIB_SUFFIX =
-LLDB_VER = release_33
 PCRE_VER = 8.36
 DSFMT_VER = 2.2
 OPENBLAS_VER = v0.2.12