Only build LLVM tools Rust needs.

diff --git a/Makefile.in b/Makefile.in
index 1d71e32abb9ca78d17619101b69133d8273f26be..97dfaa64986d69f6df0cd48e257fecb58d266f4a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -371,6 +371,9 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
 LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
                 interpreter instrumentation
 
+# Only build these LLVM tools
+LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
+
 define DEF_LLVM_VARS
 # The configure script defines these variables with the target triples
 # separated by Z. This defines new ones with the expected format.

diff --git a/mk/llvm.mk b/mk/llvm.mk
index f8d0c624de5e78d6d027b1696adc3249e4d3430a..13c4ae5e860f73f92cdeede7882c170a5885910b 100644 (file)
--- a/mk/llvm.mk
+++ b/mk/llvm.mk
@@ -28,7 +28,7 @@ LLVM_STAMP_$(1) = $$(CFG_LLVM_BUILD_DIR_$(1))/llvm-auto-clean-stamp
 
 $$(LLVM_CONFIG_$(1)): $$(LLVM_DEPS) $$(LLVM_STAMP_$(1))
        @$$(call E, make: llvm)
-       $$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1))
+       $$(Q)$$(MAKE) -C $$(CFG_LLVM_BUILD_DIR_$(1)) $$(CFG_LLVM_BUILD_ENV_$(1)) ONLY_TOOLS="$$(LLVM_TOOLS)"
        $$(Q)touch $$(LLVM_CONFIG_$(1))
 endif