aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2009-08-27 03:29:26 +0000
committerBill Wendling <isanbard@gmail.com>2009-08-27 03:29:26 +0000
commit25cd944a98bcf3b1542c71d2654fe61e28562867 (patch)
tree5c7de87c7bbfb1494ede3e77863a253d43c4cec5 /Makefile
parent0d0598f6281c0b1ae107b2fa2fabd69ec21263c4 (diff)
downloadexternal_llvm-25cd944a98bcf3b1542c71d2654fe61e28562867.zip
external_llvm-25cd944a98bcf3b1542c71d2654fe61e28562867.tar.gz
external_llvm-25cd944a98bcf3b1542c71d2654fe61e28562867.tar.bz2
--- Reverse-merging r80147 into '.':
A include/llvm/ADT/iterator.cmake U autoconf/configure.ac --- Reverse-merging r80161 into '.': U cmake/config-ix.cmake --- Reverse-merging r80171 into '.': U Makefile --- Reverse-merging r80173 into '.': U configure U include/llvm/Config/config.h.in --- Reverse-merging r80180 into '.': A include/llvm/ADT/iterator.h.in Despite common miscomceptions, iterator.h is alive and well. It broke the build bots for several hours. And yet no one bothered to look at them. Gabor and Doug, please review your changes and make sure that they actually build before resubmitting them. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80197 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5d10f8e..700b02d 100644
--- a/Makefile
+++ b/Makefile
@@ -117,6 +117,7 @@ debug-opt-prof:
dist-hook::
$(Echo) Eliminating files constructed by configure
$(Verb) $(RM) -f \
+ $(TopDistDir)/include/llvm/ADT/iterator.h \
$(TopDistDir)/include/llvm/Config/config.h \
$(TopDistDir)/include/llvm/Support/DataTypes.h \
$(TopDistDir)/include/llvm/Support/ThreadSupport.h
@@ -135,7 +136,8 @@ FilesToConfig := \
include/llvm/Config/config.h \
include/llvm/Config/Targets.def \
include/llvm/Config/AsmPrinters.def \
- include/llvm/Support/DataTypes.h
+ include/llvm/Support/DataTypes.h \
+ include/llvm/ADT/iterator.h
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
all-local:: $(FilesToConfigPATH)