Skip to content

Commit 2030ddb

Browse files
committed
DRY up deps/Makefile a tiny bit
1 parent d13a8ef commit 2030ddb

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

deps/Makefile

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -347,37 +347,30 @@ LLVM_OBJ_SOURCE := $(LLVM_BUILD_DIR)/build_$(LLVM_BUILDTYPE)/$(LLVM_FLAVOR)/lib/
347347
endif
348348
LLVM_OBJ_TARGET := $(build_libdir)/$(LLVM_LIB_FILE)
349349

350-
ifneq ($(LLVM_VER),svn)
351350
ifeq ($(LLVM_VER), 3.3)
352-
LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.gz
351+
LLVM_TAR_EXT:=$(LLVM_VER).src.tar.gz
353352
else
354-
LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.xz
355-
endif
353+
LLVM_TAR_EXT:=$(LLVM_VER).src.tar.xz
354+
endif # LLVM_VER == 3.3
355+
356+
ifneq ($(LLVM_VER),svn)
357+
LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_TAR_EXT)
356358

357359
ifeq ($(BUILD_LLDB),1)
358-
ifeq ($(LLVM_VER), 3.3)
359-
LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.gz
360-
else
361-
LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.xz
362-
endif # LLVM_VER == 3.3
360+
LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_TAR_EXT)
363361
endif # BUILD_LLDB
364362

365363
ifeq ($(BUILD_LLVM_CLANG),1)
366-
ifeq ($(LLVM_VER), 3.3)
367-
LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.gz
368-
LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.gz
369-
else
370-
LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.xz
371-
LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.xz
372-
endif # LLVM_VER
364+
LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_TAR_EXT)
365+
LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_TAR_EXT)
373366
else
374367
LLVM_CLANG_TAR:=
375368
LLVM_COMPILER_RT_TAR:=
376369
LLVM_LIBCXX_TAR:=
377370
endif # BUILD_LLVM_CLANG
378371

379372
ifeq ($(BUILD_CUSTOM_LIBCXX),1)
380-
LLVM_LIBCXX_TAR:=$(SRCDIR)/srccache/libcxx-$(LLVM_VER).src.tar.gz
373+
LLVM_LIBCXX_TAR:=$(SRCDIR)/srccache/libcxx-$(LLVM_TAR_EXT)
381374
endif
382375
endif # LLVM_VER != svn
383376

0 commit comments

Comments
 (0)