Also allow clang and compiler-rt to be installed from git

jiahao · Dec 12, 2013 · 5bc9712 · 5bc9712
1 parent c93af2f
commit 5bc9712
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/Make.inc b/Make.inc
@@ -392,7 +392,7 @@ else
 endif
 
 ifeq ($(OS), Linux)
-OSLIBS += -ldl -lrt -lpthread -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
+OSLIBS += -ldl -ltinfo -lrt -lpthread -Wl,--export-dynamic -Wl,--version-script=$(JULIAHOME)/src/julia.expmap -Wl,--no-whole-archive $(LIBUNWIND)
 JLDFLAGS = -Wl,-Bdynamic
 endif
 

diff --git a/deps/Makefile b/deps/Makefile
@@ -297,15 +297,50 @@ else
  git clone http:https://llvm.org/git/llvm.git llvm-$(LLVM_VER) ) || \
  (cd llvm-$(LLVM_VER) && \
  git pull --ff-only)
+ifneq ($(LLVM_GIT_VER),)
+ (cd llvm-$(LLVM_VER) && \
+ git checkout $(LLVM_GIT_VER))
 endif
+endif
+ifneq ($(LLVM_VER),svn)
 ifneq ($(LLVM_CLANG_TAR),)
  mkdir -p llvm-$(LLVM_VER)/tools/clang && \
  tar -C llvm-$(LLVM_VER)/tools/clang --strip-components 1 -xf $(LLVM_CLANG_TAR)
 endif
+else
+ifneq ($(BUILD_LLVM_CLANG),)
+ ([ ! -d llvm-$(LLVM_VER)/tools/clang ] && \
+ git clone http:https://llvm.org/git/clang.git llvm-$(LLVM_VER)/tools/clang ) || \
+ (cd llvm-$(LLVM_VER)/tools/clang && \
+ git pull --ff-only) 
+endif
+endif
+ifneq ($(LLVM_VER),svn)
 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_LIBCXX_TAR),)
+ mkdir -p llvm-$(LLVM_VER)/projects/libcxx && \
+ tar -C llvm-$(LLVM_VER)/projects/libcxx --strip-components 1 -xf $(LLVM_LIBCXX_TAR)
+endif
+else
+ifneq ($(BUILD_LLVM_CLANG),)
+ ([ ! -d llvm-$(LLVM_VER)/tools/clang ] && \
+ git clone http:https://llvm.org/git/clang.git llvm-$(LLVM_VER)/tools/clang ) || \
+ (cd llvm-$(LLVM_VER)/tools/clang && \
+ git pull --ff-only)
+ ([ ! -d llvm-$(LLVM_VER)/projects/compiler-rt ] && \
+ git clone http:https://llvm.org/git/compiler-rt.git llvm-$(LLVM_VER)/projects/compiler-rt ) || \
+ (cd llvm-$(LLVM_VER)/projects/compiler-rt && \
+ git pull --ff-only) 
+ifneq ($(LLVM_CLANG_VER),)
+ (cd llvm-$(LLVM_VER) && \
+ git checkout $(LLVM_GIT_VER))
+endif
+endif
+endif
+
 ifeq ($(BUILD_LLDB), 1)
  ([ ! -d llvm-$(LLVM_VER)/tools/lldb ] && \
  (cd llvm-$(LLVM_VER)/tools && \