Merged in release_13 branch.

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

diff --git a/Makefile.config.in b/Makefile.config.in
index 266800f81d717a1c01af9f274e7f0526fa96c4a5..034962a7dbf267365e610713dd6bfe7cc920b75d 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -1,9 +1,16 @@
-#===-- Makefile.config - Local configuration for LLVM ------*- makefile -*--====
+#===-- Makefile.config - Local configuration for LLVM ------*- Makefile -*--===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by the LLVM research group and is distributed under
+# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 #
 # This file is included by Makefile.common.  It defines paths and other
 # values specific to a particular installation of LLVM.
 #
-#===-----------------------------------------------------------------------====
+#===------------------------------------------------------------------------===#
 
 # Target operating system for which LLVM will be compiled.
 OS=@OS@
@@ -16,16 +23,14 @@ ENDIAN=@ENDIAN@
 
 # Path to the C++ compiler to use.  This is an optional setting, which defaults
 # to whatever your gmake defaults to.
-#
-# Under Linux, for some reason the compiler driver wants to search the PATH to
-# find the system assembler, which breaks if the LLVM assembler is in our path.
-# Hack it to use the assembler in /usr/bin directly.
 CXX = @CXX@
 
-# We have the same problem with the CC binary, which use used by testcases for
-# native builds.
+# Path to the CC binary, which use used by testcases for native builds.
 CC := @CC@
 
+# Path to the Python interpreter
+PYTHON := @PYTHON@
+
 # Linker flags.
 LDFLAGS+=@LDFLAGS@
 
@@ -65,8 +70,8 @@ LCC1XX = @LLVMCC1PLUS@
 # object files.
 OBJ_ROOT := .
 
-# Path to location for LLVM front-end this should only be specified here if you
-# want to override the value set in Makefile.$(uname)
+# Path to location for LLVM C/C++ front-end. You can modify this if you
+# want to override the value set by configure.
 LLVMGCCDIR := @LLVMGCCDIR@
 
 # When this variable is set to 1, programs in the llvm/test/Programs hierarchy
@@ -90,7 +95,7 @@ BYTECODE_REPOSITORY := @BCR@
 @USE_SPEC95@
 
 # Path to the SPEC benchmarks.
-SPEC_ROOT := @SPEC2000_ROOT@
+SPEC2000_ROOT := @SPEC2000_ROOT@
 SPEC95_ROOT := @SPEC95_ROOT@
 
 # Path to the Povray source code.
@@ -126,6 +131,9 @@ PAPIDIR := @PAPIDIR@
 # Shared library extension for this platform.
 SHLIBEXT = @SHLIBEXT@
 
+# Executable file extension for this platform.
+EXEEXT = @EXEEXT@
+
 ###########################################################################
 # Directory Configuration
 #      This section of the Makefile determines what is where.  To be