Initial checkin

[oota-llvm.git] / Makefile.config.in

diff --git a/Makefile.config.in b/Makefile.config.in
index 81fd80d4f2feadd0197ca2c34af0a15669069668..de4732d931a9cb4f21dab6aa84a2a5c7967c4792 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -9,6 +9,11 @@
 #
 OS=@OS@
 
+#
+# Target hardware architecture
+#
+ARCH=@ARCH@
+
 # Path to the C++ compiler to use.  This is an optional setting, which defaults
 # to whatever your gmake defaults to.
 #
@@ -26,10 +31,19 @@ CC := @CC@
 #
 # Compilation flags for the C and C++ compilers.
 #
-CPPFLAGS=@DEFS@
-CCFLAGS=@DEFS@
-LDFLAGS=@LDFLAGS@
-LIBS=@LIBS@
+
+#
+# Removing the compiler flags for now.  They interfere with the test suite
+# (which has its own autoconf stuff), and we don't use -DHAVE_CONFIG_H anyway.
+#
+#CPPFLAGS+=@DEFS@
+#CCFLAGS+=@DEFS@
+LDFLAGS+=@LDFLAGS@
+
+#
+# Removed since it prevents the tests from working properly.
+#
+#LIBS+=@LIBS@
 
 #
 # Libraries needed by tools
@@ -53,7 +67,7 @@ FLEX     = @LEX@
 SED     = @SED@
 RM      = @RM@
 ECHO    = @ECHO@
-MKDIR   = @abs_top_srcdir@/mkinstalldirs
+MKDIR   = @abs_top_srcdir@/autoconf/mkinstalldirs
 DATE    = @DATE@
 MV      = @MV@
 INSTALL = @INSTALL@
@@ -132,14 +146,12 @@ PAPIDIR := @PAPIDIR@
 # information to allow gprof to be used to get execution frequencies.
 #
 #ENABLE_PROFILING = 1
-@ENABLE_PROFILING@
 
 #
-# This open tells the Makefiles to produce verbose output.
+# This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #
 #VERBOSE = 1
-@ENABLE_VERBOSE@
 
 # When ENABLE_PURIFY is set to 1, the LLVM tools are linked with purify (which
 # must be locally installed) to allow for some automated memory error debugging.