Reapply patch from r62553, with a fix to avoid looking for an ffi.h that isn't

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

diff --git a/Makefile.config.in b/Makefile.config.in
index 72ab66e4d2b814a89dfeb5f4c380644fe510acf6..96dab4561198a5bcc89cd75ed37810ebab37b89b 100644 (file)
--- 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@
 
@@ -145,16 +150,17 @@ 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@
 GROFF      := @GROFF@
 GZIP       := @GZIP@
-OCAMLC     := "@OCAMLC@"
-OCAMLOPT   := "@OCAMLOPT@"
-OCAMLDEP   := "@OCAMLDEP@"
-OCAMLDOC   := "@OCAMLDOC@"
+OCAMLC     := @OCAMLC@
+OCAMLOPT   := @OCAMLOPT@
+OCAMLDEP   := @OCAMLDEP@
+OCAMLDOC   := @OCAMLDOC@
+GAS        := @GAS@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
 RUNTEST    := @RUNTEST@
@@ -201,12 +207,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@
@@ -234,6 +240,9 @@ ENABLE_THREADS := @ENABLE_THREADS@
 # Do we want to build with position independent code?
 ENABLE_PIC := @ENABLE_PIC@
 
+# Use -fvisibility-inlines-hidden?
+ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@
+
 # This option tells the Makefiles to produce verbose output.
 # It essentially prints the commands that make is executing
 #VERBOSE = 1
@@ -274,3 +283,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@