diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
| commit | 5c897cf45a7b9df227e0c562c27454f56ba86c20 (patch) | |
| tree | ae3a9ea4d11bfb20379639dd9ca0951ce411e73a /Makefile | |
| parent | 89758b0545198f9a3876f0deb747146cbd84ce61 (diff) | |
| parent | a8a0a155de16830b8fcab539ba2ec21de3145532 (diff) | |
Merge commit 'a8a0a155de16830b8fcab539ba2ec21de3145532'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
The Intel folks switched some of the FrameLowering code to use
X86RegisterInfo::getSlotSize isntead of pointer size, thus reducing
our localmods in that file.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -73,10 +73,13 @@ endif ifeq ($(MAKECMDGOALS),install-clang) DIRS := tools/clang/tools/driver tools/clang/lib/Headers \ - tools/clang/tools/libclang tools/clang/tools/c-index-test \ + tools/clang/tools/libclang \ tools/clang/include/clang-c \ tools/clang/runtime tools/clang/docs \ tools/lto runtime + ifneq ($(BUILD_CLANG_ONLY),YES) + DIRS += tools/clang/tools/c-index-test + endif OPTIONAL_DIRS := NO_INSTALL = 1 endif |