projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-enable unit tests disabled in r94164 by telling GTest about the
[oota-llvm.git]
/
Makefile.config.in
diff --git
a/Makefile.config.in
b/Makefile.config.in
index ecd05957d9dde3714cac1961fc200cd583d11a6f..2cc69dcf4cf6534afb8d58a45ac37b44c08b24ef 100644
(file)
--- a/
Makefile.config.in
+++ b/
Makefile.config.in
@@
-110,6
+110,9
@@
BUILD_EXEEXT=@BUILD_EXEEXT@
BUILD_CC=@BUILD_CC@
BUILD_CXX=@BUILD_CXX@
BUILD_CC=@BUILD_CC@
BUILD_CXX=@BUILD_CXX@
+# Triple for configuring build tools when cross-compiling
+BUILD_TRIPLE=@build@
+
# Target triple (cpu-vendor-os) for which we should generate code
TARGET_TRIPLE=@target@
# Target triple (cpu-vendor-os) for which we should generate code
TARGET_TRIPLE=@target@
@@
-242,6
+245,14
@@
RDYNAMIC := @RDYNAMIC@
#DEBUG_RUNTIME = 1
@DEBUG_RUNTIME@
#DEBUG_RUNTIME = 1
@DEBUG_RUNTIME@
+# When DEBUG_SYMBOLS is enabled, the compiler libraries will retain debug
+# symbols.
+#DEBUG_SYMBOLS = 1
+@DEBUG_SYMBOLS@
+
+# The compiler flags to use for optimized builds.
+OPTIMIZE_OPTION := @OPTIMIZE_OPTION@
+
# When ENABLE_PROFILING is enabled, the llvm source base is built with profile
# information to allow gprof to be used to get execution frequencies.
#ENABLE_PROFILING = 1
# When ENABLE_PROFILING is enabled, the llvm source base is built with profile
# information to allow gprof to be used to get execution frequencies.
#ENABLE_PROFILING = 1
@@
-302,6
+313,12
@@
endif
# Location of the plugin header file for gold.
BINUTILS_INCDIR := @BINUTILS_INCDIR@
# Location of the plugin header file for gold.
BINUTILS_INCDIR := @BINUTILS_INCDIR@
+C_INCLUDE_DIRS := @C_INCLUDE_DIRS@
+CXX_INCLUDE_ROOT := @CXX_INCLUDE_ROOT@
+CXX_INCLUDE_ARCH := @CXX_INCLUDE_ARCH@
+CXX_INCLUDE_32BIT_DIR = @CXX_INCLUDE_32BIT_DIR@
+CXX_INCLUDE_64BIT_DIR = @CXX_INCLUDE_64BIT_DIR@
+
# When ENABLE_LLVMC_DYNAMIC is enabled, LLVMC will link libCompilerDriver
# dynamically. This is needed to make dynamic plugins work on some targets
# (Windows).
# When ENABLE_LLVMC_DYNAMIC is enabled, LLVMC will link libCompilerDriver
# dynamically. This is needed to make dynamic plugins work on some targets
# (Windows).
@@
-312,3
+329,9
@@
ENABLE_LLVMC_DYNAMIC = 0
# support (via the -load option).
ENABLE_LLVMC_DYNAMIC_PLUGINS = 1
#@ENABLE_LLVMC_DYNAMIC_PLUGINS@
# support (via the -load option).
ENABLE_LLVMC_DYNAMIC_PLUGINS = 1
#@ENABLE_LLVMC_DYNAMIC_PLUGINS@
+
+# Optional flags supported by the compiler
+# -Wno-missing-field-initializers
+NO_MISSING_FIELD_INITIALIZERS = @NO_MISSING_FIELD_INITIALIZERS@
+# -Wno-variadic-macros
+NO_VARIADIC_MACROS = @NO_VARIADIC_MACROS@