diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-08-21 22:23:49 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-08-21 22:23:49 +0000 |
| commit | e430a1eefb5a4a3e45dc77884cf5921e2ae1b8c1 (patch) | |
| tree | 2e661abab188048541933dd21b5eab2fb80c56e6 /Makefile.common | |
| parent | c137b3043fea7dd88daf0bac24dd5727268860a8 (diff) | |
| download | llvm-e430a1eefb5a4a3e45dc77884cf5921e2ae1b8c1.tar.gz llvm-e430a1eefb5a4a3e45dc77884cf5921e2ae1b8c1.tar.bz2 llvm-e430a1eefb5a4a3e45dc77884cf5921e2ae1b8c1.tar.xz | |
Projects no longer need to specify LLVM_OBJ_ROOT. Also, for the prdirs target, don't let make print out all of the echo commands before the echos get echo'd
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8034 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Makefile.common b/Makefile.common index 5c004b3247..7effb4cd20 100644 --- a/Makefile.common +++ b/Makefile.common @@ -32,9 +32,6 @@ # # 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree. # -# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM -# object files are placed. -# # 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles # and usually the source code too (unless SourceDir is set). # @@ -46,8 +43,7 @@ # placed. # # For building, -# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and -# LLVM_OBJ_ROOT = BUILD_OBJ_ROOT. +# LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT # #===-----------------------------------------------------------------------==== @@ -127,7 +123,7 @@ endif # Set the LLVM object directory. # ifndef LLVM_OBJ_ROOT -LLVM_OBJ_ROOT := $(BUILD_OBJ_ROOT) +LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd) endif ########################################################################### @@ -161,13 +157,13 @@ bytecode:: # Print out the directories used for building prdirs:: - echo "Home Offset : " $(HOME_OBJ_ROOT) - echo "Build Source Root: " $(BUILD_SRC_ROOT) - echo "Build Source Dir : " $(BUILD_SRC_DIR) - echo "Build Object Root: " $(BUILD_OBJ_ROOT) - echo "Build Object Dir : " $(BUILD_OBJ_DIR) - echo "LLVM Source Root: " $(LLVM_SRC_ROOT) - echo "LLVM Object Root: " $(LLVM_OBJ_ROOT) + @echo "Home Offset : " $(HOME_OBJ_ROOT) + @echo "Build Source Root: " $(BUILD_SRC_ROOT) + @echo "Build Source Dir : " $(BUILD_SRC_DIR) + @echo "Build Object Root: " $(BUILD_OBJ_ROOT) + @echo "Build Object Dir : " $(BUILD_OBJ_DIR) + @echo "LLVM Source Root: " $(LLVM_SRC_ROOT) + @echo "LLVM Object Root: " $(LLVM_OBJ_ROOT) ########################################################################### # Suffixes and implicit rules: |