X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.config.in;h=6f91bee930012f3e4df949adff5a363bf6d4cbe9;hb=a9183c8020c3203f7597d1fbfe4244dd99c7981e;hp=5a0dcd59c3a31e3d4515f498a9fe47a4edf5cf43;hpb=dcf114e8610784e15c89eed2ad3ca930fa0634ed;p=oota-llvm.git

diff --git a/Makefile.config.in b/Makefile.config.in
index 5a0dcd59c3a..6f91bee9300 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -4,7 +4,7 @@
 #
 # This file 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
@@ -102,6 +102,11 @@ LLVM_CROSS_COMPILING=@LLVM_CROSS_COMPILING@
 # tablegen call if we're cross-compiling).
 BUILD_EXEEXT=@BUILD_EXEEXT@
 
+# Compilers for the build platflorm (mainly for tablegen
+# call if we're cross-compiling).
+BUILD_CC=@BUILD_CC@
+BUILD_CXX=@BUILD_CXX@
+
 # Target triple (cpu-vendor-os) for which we should generate code
 TARGET_TRIPLE=@target@
 
@@ -128,12 +133,10 @@ AR_PATH = @AR@
 NM_PATH = @NM@
 
 # The pathnames of the programs we require to build
-BISON      := @BISON@
 CMP        := @CMP@
 CP         := @CP@
 DATE       := @DATE@
 FIND       := @FIND@
-FLEX       := @LEX@
 GREP       := @GREP@
 INSTALL    := @INSTALL@
 MKDIR      := $(LLVM_SRC_ROOT)/autoconf/mkinstalldirs
@@ -142,10 +145,9 @@ RANLIB     := @RANLIB@
 RM         := @RM@
 SED        := @SED@
 TAR        := @TAR@
-YACC       := @YACC@
 
 # Paths to miscellaneous programs we hope are present but might not be
-PERL       := @PERL@ 
+PERL       := @PERL@
 BZIP2      := @BZIP2@
 DOT        := @DOT@
 DOXYGEN    := @DOXYGEN@
@@ -155,6 +157,7 @@ OCAMLC     := @OCAMLC@
 OCAMLOPT   := @OCAMLOPT@
 OCAMLDEP   := @OCAMLDEP@
 OCAMLDOC   := @OCAMLDOC@
+GAS        := @GAS@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
 RUNTEST    := @RUNTEST@
@@ -201,12 +204,12 @@ OBJ_ROOT := .
 # make command line (ie, make ENABLE_PROFILING=1):
 
 # When ENABLE_OPTIMIZED is enabled, LLVM code is optimized and output is put
-# into the "Release" directories. Otherwise, LLVM code is not optimized and 
+# into the "Release" directories. Otherwise, LLVM code is not optimized and
 # output is put in the "Debug" directories.
 #ENABLE_OPTIMIZED = 1
 @ENABLE_OPTIMIZED@
 
-# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will 
+# When DISABLE_ASSERTIONS is enabled, builds of all of the LLVM code will
 # exclude assertion checks, otherwise they are included.
 #DISABLE_ASSERTIONS = 1
 @DISABLE_ASSERTIONS@
@@ -277,3 +280,9 @@ ifneq (,$(findstring -mno-cygwin, $(CXX)))
 else
   SYSPATH = $(1)
 endif
+
+# Location of the plugin header file for gold.
+BINUTILS_INCDIR := @BINUTILS_INCDIR@
+
+# Can we use libFFI for the interpreter?
+HAVE_FFI := @HAVE_FFI@