Eliminate use of DSCallSiteIterator in key loop. This is a half step to

[oota-llvm.git] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 1884a8a0e048d313f5dbc8bc3190c2ffe9bc15d2..d33d3da9b86614dbec0873f603b10e7b1d922959 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,11 +1,11 @@
-#===-- Makefile.common - Common make rules for LLVM -------*- makefile -*--====
+#===-- Makefile.common - Common make rules 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 all of the LLVM makefiles.  This file defines common
 # rules to do things like compile a .cpp file or generate dependency info.
@@ -16,7 +16,7 @@
 # The variable $(LEVEL) *must* be set:
 #
 # 1. LEVEL - The level of the current subdirectory from the top of the 
-#    MagicStats view.  This level should be expressed as a path, for 
+#    source directory.  This level should be expressed as a path, for 
 #    example, ../.. for two levels deep.
 #
 # 2. DIRS - A list of subdirectories to be built.  Fake targets are set up
@@ -57,7 +57,11 @@
 #
 # Configuration file to set paths specific to local installation of LLVM
 # 
+ifndef LLVM_OBJ_ROOT
 include $(LEVEL)/Makefile.config
+else
+include $(LLVM_OBJ_ROOT)/Makefile.config
+endif
 
 #
 # Include all of the build rules used for making LLVM