projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove commented-out code, it is subsumed by DECLARE_TRANSPARENT_OPERAND_ACCESSORS
[oota-llvm.git]
/
Makefile.common
diff --git
a/Makefile.common
b/Makefile.common
index 9fe71c0b1c6ca1da7cbc73c5e48399c2abb0e9c4..18a4ace19fd00ef3cd0752ba9404db256868ad81 100644
(file)
--- a/
Makefile.common
+++ b/
Makefile.common
@@
-2,8
+2,8
@@
#
# The LLVM Compiler Infrastructure
#
#
# 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.
#
#===------------------------------------------------------------------------===#
#
#
#===------------------------------------------------------------------------===#
#
@@
-16,7
+16,7
@@
# The variable $(LEVEL) *must* be set:
#
# 1. LEVEL - The level of the current subdirectory from the top of the
# 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
# example, ../.. for two levels deep.
#
# 2. DIRS - A list of subdirectories to be built. Fake targets are set up
@@
-39,25
+39,29
@@
#
# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
#
#
# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
#
-# 8.
BUILD
_SRC_DIR - The directory which contains the current set of Makefiles
+# 8.
PROJ
_SRC_DIR - The directory which contains the current set of Makefiles
# and usually the source code too (unless SourceDir is set).
#
# and usually the source code too (unless SourceDir is set).
#
-# 9.
BUILD
_SRC_ROOT - The root directory of the source code being compiled.
+# 9.
PROJ
_SRC_ROOT - The root directory of the source code being compiled.
#
#
-# 10.
BUILD
_OBJ_DIR - The directory where object code should be placed.
+# 10.
PROJ
_OBJ_DIR - The directory where object code should be placed.
#
#
-# 11.
BUILD
_OBJ_ROOT - The root directory for where object code should be
+# 11.
PROJ
_OBJ_ROOT - The root directory for where object code should be
# placed.
#
# For building,
# placed.
#
# For building,
-# LLVM, LLVM_SRC_ROOT =
BUILD
_SRC_ROOT
+# LLVM, LLVM_SRC_ROOT =
PROJ
_SRC_ROOT
#
#===-----------------------------------------------------------------------====
#
# Configuration file to set paths specific to local installation of LLVM
#
#
#===-----------------------------------------------------------------------====
#
# Configuration file to set paths specific to local installation of LLVM
#
+ifndef LLVM_OBJ_ROOT
include $(LEVEL)/Makefile.config
include $(LEVEL)/Makefile.config
+else
+include $(LLVM_OBJ_ROOT)/Makefile.config
+endif
#
# Include all of the build rules used for making LLVM
#
# Include all of the build rules used for making LLVM