projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert 109076. It is wrong and was causing regressions. Add some
[oota-llvm.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index d42f887b6b18f175c3a094e4036917358b275482..e93ef605be95c6ef1f37d33c953a4a3e8fd8fd27 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-64,7
+64,8
@@
endif
ifeq ($(MAKECMDGOALS),install-clang)
DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
ifeq ($(MAKECMDGOALS),install-clang)
DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
- tools/clang/runtime tools/clang/docs
+ tools/clang/runtime tools/clang/docs \
+ tools/lto
OPTIONAL_DIRS :=
NO_INSTALL = 1
endif
OPTIONAL_DIRS :=
NO_INSTALL = 1
endif
@@
-78,7
+79,8
@@
ifeq ($(MAKECMDGOALS),install-clang-c)
endif
ifeq ($(MAKECMDGOALS),clang-only)
endif
ifeq ($(MAKECMDGOALS),clang-only)
- DIRS := $(filter-out tools runtime docs unittests, $(DIRS)) tools/clang
+ DIRS := $(filter-out tools runtime docs unittests, $(DIRS)) \
+ tools/clang tools/lto
OPTIONAL_DIRS :=
endif
OPTIONAL_DIRS :=
endif
@@
-110,7
+112,8
@@
cross-compile-build-tools:
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
cd .. ; \
fi; \
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
cd .. ; \
fi; \
- ($(MAKE) -C BuildTools \
+ (unset SDKROOT; \
+ $(MAKE) -C BuildTools \
BUILD_DIRS_ONLY=1 \
UNIVERSAL= \
ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
BUILD_DIRS_ONLY=1 \
UNIVERSAL= \
ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \