Set ARCH to x86 on mixed 32/64-bit Linux systems.

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

diff --git a/Makefile.config.in b/Makefile.config.in
index bcf1a00e12367f0aebcbd40e997688719ebe9125..9d8ee3b137c4439f2f109cf5af2f80efb85a48d1 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -133,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
@@ -147,7 +145,6 @@ RANLIB     := @RANLIB@
 RM         := @RM@
 SED        := @SED@
 TAR        := @TAR@
-YACC       := @YACC@
 
 # Paths to miscellaneous programs we hope are present but might not be
 PERL       := @PERL@
@@ -203,6 +200,12 @@ LLVMGCC_LANGS := @LLVMGCC_LANGS@
 # object files.
 OBJ_ROOT := .
 
+# What to pass as rpath flag to g++
+RPATH := @RPATH@
+
+# What to pass as -rdynamic flag to g++
+RDYNAMIC := @RDYNAMIC@
+
 # These are options that can either be enabled here, or can be enabled on the
 # make command line (ie, make ENABLE_PROFILING=1):
 
@@ -283,3 +286,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@