projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
now that @GOTOFF is no longer represented as a suffix on a
[oota-llvm.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index cc7e550a1bdaa4834597ddd2721069024ef94008..319bdcd0fbac522d8ddf523a361ad03e51958ccf 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-32,7
+32,11
@@
ifeq ($(BUILD_DIRS_ONLY),1)
else
DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
tools runtime docs unittests
else
DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
tools runtime docs unittests
- OPTIONAL_DIRS := examples projects bindings
+ OPTIONAL_DIRS := projects bindings
+endif
+
+ifeq ($(BUILD_EXAMPLES),1)
+ OPTIONAL_DIRS += examples
endif
EXTRA_DIST := test unittests llvm.spec include win32 Xcode
endif
EXTRA_DIST := test unittests llvm.spec include win32 Xcode
@@
-62,8
+66,8
@@
ifeq ($(MAKECMDGOALS),tools-only)
endif
ifeq ($(MAKECMDGOALS),install-clang)
endif
ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/
tools/clang-cc
\
-
tools/clang/lib/Headers
tools/clang/docs
+ DIRS := tools/clang/tools/driver tools/clang/
lib/Headers
\
+
tools/clang/lib/Runtime
tools/clang/docs
OPTIONAL_DIRS :=
NO_INSTALL = 1
endif
OPTIONAL_DIRS :=
NO_INSTALL = 1
endif
@@
-95,6
+99,8
@@
cross-compile-build-tools:
$(Verb) if [ ! -f BuildTools/Makefile ]; then \
$(MKDIR) BuildTools; \
cd BuildTools ; \
$(Verb) if [ ! -f BuildTools/Makefile ]; then \
$(MKDIR) BuildTools; \
cd BuildTools ; \
+ unset CFLAGS ; \
+ unset CXXFLAGS ; \
$(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
cd .. ; \
$(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
cd .. ; \
@@
-149,9
+155,11
@@
install-libs: install
FilesToConfig := \
include/llvm/Config/config.h \
include/llvm/Config/Targets.def \
FilesToConfig := \
include/llvm/Config/config.h \
include/llvm/Config/Targets.def \
- include/llvm/Config/AsmPrinters.def \
+ include/llvm/Config/AsmPrinters.def \
+ include/llvm/Config/AsmParsers.def \
+ include/llvm/Config/Disassemblers.def \
include/llvm/System/DataTypes.h \
include/llvm/System/DataTypes.h \
-
tools/llvmc/plugins/Base/Base.td
+ tools/llvmc/plugins/Base/Base.td
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
all-local:: $(FilesToConfigPATH)
FilesToConfigPATH := $(addprefix $(LLVM_OBJ_ROOT)/,$(FilesToConfig))
all-local:: $(FilesToConfigPATH)