diff options
| author | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-02-11 20:01:10 -0800 |
| commit | ce9904c6ea8fd669978a8eefb854b330eb9828ff (patch) | |
| tree | 2418ee2e96ea220977c8fb74959192036ab5b133 /tools/Makefile | |
| parent | c27b10b198c1d9e9b51f2303994313ec2778edd7 (diff) | |
| parent | dbb832b83351cec97b025b61c26536ef50c3181c (diff) | |
| download | external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.zip external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.gz external_llvm-ce9904c6ea8fd669978a8eefb854b330eb9828ff.tar.bz2 | |
Merge remote-tracking branch 'upstream/release_34' into merge-20140211
Conflicts:
lib/Linker/LinkModules.cpp
lib/Support/Unix/Signals.inc
Change-Id: Ia54f291fa5dc828052d2412736e8495c1282aa64
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/tools/Makefile b/tools/Makefile index b7375c9..be87254 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,15 +27,11 @@ OPTIONAL_DIRS := lldb # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. DIRS := llvm-config -PARALLEL_DIRS := opt llvm-as llvm-dis \ - llc llvm-ar llvm-nm \ - llvm-prof llvm-link \ - lli llvm-extract llvm-mc \ - bugpoint llvm-bcanalyzer \ - llvm-diff macho-dump llvm-objdump llvm-readobj \ - llvm-rtdyld llvm-dwarfdump llvm-cov \ - llvm-size llvm-stress llvm-mcmarkup \ - llvm-symbolizer obj2yaml yaml2obj +PARALLEL_DIRS := opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link \ + lli llvm-extract llvm-mc bugpoint llvm-bcanalyzer llvm-diff \ + macho-dump llvm-objdump llvm-readobj llvm-rtdyld \ + llvm-dwarfdump llvm-cov llvm-size llvm-stress llvm-mcmarkup \ + llvm-symbolizer obj2yaml yaml2obj llvm-c-test # If Intel JIT Events support is configured, build an extra tool to test it. ifeq ($(USE_INTEL_JITEVENTS), 1) @@ -54,11 +50,10 @@ endif ifndef ONLY_TOOLS ifeq ($(ENABLE_PIC),1) # gold only builds if binutils is around. It requires "lto" to build before - # it so it is added to DIRS. + # it so it is added to DIRS. llvm-lto also requires lto + DIRS += lto llvm-lto ifdef BINUTILS_INCDIR - DIRS += lto gold - else - PARALLEL_DIRS += lto + DIRS += gold endif PARALLEL_DIRS += bugpoint-passes |