From 741ae96bc735ced60e5ee00efe9b1327a1fd3c59 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Sun, 10 Jan 2016 02:59:14 -0500 Subject: [PATCH] DRY up deps/Makefile a tiny bit --- deps/Makefile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 3b2af70e9b3e33..d12b841f172719 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -347,29 +347,22 @@ LLVM_OBJ_SOURCE := $(LLVM_BUILD_DIR)/build_$(LLVM_BUILDTYPE)/$(LLVM_FLAVOR)/lib/ endif LLVM_OBJ_TARGET := $(build_libdir)/$(LLVM_LIB_FILE) -ifneq ($(LLVM_VER),svn) ifeq ($(LLVM_VER), 3.3) -LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.gz +LLVM_TAR_EXT:=$(LLVM_VER).src.tar.gz else -LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.xz -endif +LLVM_TAR_EXT:=$(LLVM_VER).src.tar.xz +endif # LLVM_VER == 3.3 + +ifneq ($(LLVM_VER),svn) +LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_TAR_EXT) ifeq ($(BUILD_LLDB),1) -ifeq ($(LLVM_VER), 3.3) -LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.gz -else -LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.xz -endif # LLVM_VER == 3.3 +LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_TAR_EXT) endif # BUILD_LLDB ifeq ($(BUILD_LLVM_CLANG),1) -ifeq ($(LLVM_VER), 3.3) -LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.gz -LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.gz -else -LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.xz -LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.xz -endif # LLVM_VER +LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_TAR_EXT) +LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_TAR_EXT) else LLVM_CLANG_TAR:= LLVM_COMPILER_RT_TAR:=