X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.config.in;h=5a0dcd59c3a31e3d4515f498a9fe47a4edf5cf43;hb=f95f945fb00ea7fb33adab917ceb022451e9f2a5;hp=146fa1dda8df74e3ff8df1e63601f8bf6822d61e;hpb=89b0d995d26d9e70b9c8d7fab8b99f1e89ac11bb;p=oota-llvm.git

diff --git a/Makefile.config.in b/Makefile.config.in
index 146fa1dda8d..5a0dcd59c3a 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -2,8 +2,8 @@
 #
 #                     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 distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 #===------------------------------------------------------------------------===#
 #
@@ -47,16 +47,8 @@ LLVM_SRC_ROOT   := $(shell cd @abs_top_srcdir@; $(PWD))
 LLVM_OBJ_ROOT   := $(shell cd @abs_top_builddir@; $(PWD))
 PROJ_SRC_ROOT   := $(shell cd $(LLVM_SRC_ROOT); $(PWD))
 PROJ_SRC_DIR    := $(shell cd $(LLVM_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-DESTDIR         := @prefix@
-PROJ_prefix     := $(DESTDIR)
-PROJ_bindir     := $(DESTDIR)/bin
-PROJ_libdir     := $(DESTDIR)/lib
-PROJ_datadir    := $(DESTDIR)/share
-PROJ_docsdir    := $(DESTDIR)/docs/llvm
-PROJ_etcdir     := $(DESTDIR)/etc/llvm
-PROJ_includedir := $(DESTDIR)/include
-PROJ_infodir    := $(DESTDIR)/info
-PROJ_mandir     := $(DESTDIR)/man
+prefix          := @prefix@
+PROJ_prefix     := $(prefix)
 PROJ_VERSION    := $(LLVMVersion)
 else
 ifndef PROJ_SRC_ROOT
@@ -75,20 +67,24 @@ ifndef LLVM_OBJ_ROOT
 $(error Projects must define LLVM_OBJ_ROOT)
 endif
 PROJ_SRC_DIR := $(shell cd $(PROJ_SRC_ROOT)/$(patsubst $(PROJ_OBJ_ROOT)%,%,$(PROJ_OBJ_DIR)); $(PWD))
-PROJ_prefix     := $(PROJ_INSTALL_ROOT)
-PROJ_bindir     := $(PROJ_INSTALL_ROOT)/bin
-PROJ_libdir     := $(PROJ_INSTALL_ROOT)/lib
-PROJ_datadir    := $(PROJ_INSTALL_ROOT)/share
-PROJ_docsdir    := $(PROJ_INSTALL_ROOT)/docs/llvm
-PROJ_etcdir     := $(PROJ_INSTALL_ROOT)/etc/llvm
-PROJ_includedir := $(PROJ_INSTALL_ROOT)/include
-PROJ_infodir    := $(PROJ_INSTALL_ROOT)/info
-PROJ_mandir     := $(PROJ_INSTALL_ROOT)/man
+prefix          := $(PROJ_INSTALL_ROOT)
+PROJ_prefix     := $(prefix)
 ifndef PROJ_VERSION
 PROJ_VERSION := 1.0
 endif
 endif
 
+LLVMMAKE := $(LLVM_SRC_ROOT)/make
+
+PROJ_bindir     := $(DESTDIR)$(PROJ_prefix)/bin
+PROJ_libdir     := $(DESTDIR)$(PROJ_prefix)/lib
+PROJ_datadir    := $(DESTDIR)$(PROJ_prefix)/share
+PROJ_docsdir    := $(DESTDIR)$(PROJ_prefix)/docs/llvm
+PROJ_etcdir     := $(DESTDIR)$(PROJ_prefix)/etc/llvm
+PROJ_includedir := $(DESTDIR)$(PROJ_prefix)/include
+PROJ_infodir    := $(DESTDIR)$(PROJ_prefix)/info
+PROJ_mandir     := $(DESTDIR)$(PROJ_prefix)/share/man
+
 # Determine if we're on a unix type operating system
 LLVM_ON_UNIX:=@LLVM_ON_UNIX@
 LLVM_ON_WIN32:=@LLVM_ON_WIN32@
@@ -109,9 +105,6 @@ BUILD_EXEEXT=@BUILD_EXEEXT@
 # Target triple (cpu-vendor-os) for which we should generate code
 TARGET_TRIPLE=@target@
 
-# Targets that we should build
-TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
-
 # Extra options to compile LLVM with
 EXTRA_OPTIONS=@EXTRA_OPTIONS@
 
@@ -156,10 +149,12 @@ PERL       := @PERL@
 BZIP2      := @BZIP2@
 DOT        := @DOT@
 DOXYGEN    := @DOXYGEN@
-ETAGS      := @ETAGS@
-ETAGSFLAGS := @ETAGSFLAGS@
 GROFF      := @GROFF@
 GZIP       := @GZIP@
+OCAMLC     := @OCAMLC@
+OCAMLOPT   := @OCAMLOPT@
+OCAMLDEP   := @OCAMLDEP@
+OCAMLDOC   := @OCAMLDOC@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
 RUNTEST    := @RUNTEST@
@@ -171,6 +166,9 @@ HAVE_PTHREAD := @HAVE_PTHREAD@
 
 LIBS       := @LIBS@
 
+# Targets that we should build
+TARGETS_TO_BUILD=@TARGETS_TO_BUILD@
+
 # 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@
@@ -182,6 +180,9 @@ else
 LLVMGCCARCH := @target@/@LLVMGCC_VERSION@
 endif
 
+# Determine the path where the library executables are
+LLVMGCCLIBEXEC := @LLVMGCCLIBEXEC@
+
 # Full pathnames of LLVM C/C++ front-end 'cc1' and 'cc1plus' binaries:
 LLVMGCC  := @LLVMGCC@
 LLVMGXX  := @LLVMGXX@
@@ -189,6 +190,7 @@ LLVMCC1  := @LLVMCC1@
 LLVMCC1PLUS := @LLVMCC1PLUS@
 LLVMGCC_VERSION := @LLVMGCC_VERSION@
 LLVMGCC_MAJVERS := @LLVMGCC_MAJVERS@
+LLVMGCC_LANGS := @LLVMGCC_LANGS@
 
 # Path to directory where object files should be stored during a build.
 # Set OBJ_ROOT to "." if you do not want to use a separate place for
@@ -209,6 +211,11 @@ OBJ_ROOT := .
 #DISABLE_ASSERTIONS = 1
 @DISABLE_ASSERTIONS@
 
+# When ENABLE_EXPENSIVE_CHECKS is enabled, builds of all of the LLVM
+# code will include expensive checks, otherwise they are excluded.
+#ENABLE_EXPENSIVE_CHECKS = 0
+@ENABLE_EXPENSIVE_CHECKS@
+
 # When DEBUG_RUNTIME is enabled, the runtime libraries will retain debug
 # symbols.
 #DEBUG_RUNTIME = 1
@@ -227,6 +234,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
@@ -253,3 +263,17 @@ NOLINKALL := @NOLINKALL@
 # Get the value of HUGE_VAL_SANITY which will be either "yes" or "no" depending
 # on the check.
 HUGE_VAL_SANITY = @HUGE_VAL_SANITY@
+
+# Bindings that we should build
+BINDINGS_TO_BUILD := @BINDINGS_TO_BUILD@
+ALL_BINDINGS      := @ALL_BINDINGS@
+OCAML_LIBDIR      := @OCAML_LIBDIR@
+
+# When compiling under Mingw/Cygwin, executables such as tblgen
+# expect Windows paths, whereas the build system uses Unix paths.
+# The function SYSPATH transforms Unix paths into Windows paths.
+ifneq (,$(findstring -mno-cygwin, $(CXX)))
+  SYSPATH = $(shell echo $(1) | cygpath -m -f -)
+else
+  SYSPATH = $(1)
+endif