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 | b42c15396cd71804a9b86ca6a5ff856bc394e853 (patch) | |
| tree | ec63ba248d84f8cab4e068f10cb08532e292f52e | |
| parent | ce4e6ee6717b9480055d1f7860770846bb1153da (diff) | |
| download | bcm5719-llvm-b42c15396cd71804a9b86ca6a5ff856bc394e853.tar.gz bcm5719-llvm-b42c15396cd71804a9b86ca6a5ff856bc394e853.zip | |
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
llvm-svn: 8034
| -rw-r--r-- | llvm/Makefile.common | 22 | ||||
| -rw-r--r-- | llvm/Makefile.rules | 22 |
2 files changed, 18 insertions, 26 deletions
diff --git a/llvm/Makefile.common b/llvm/Makefile.common index 5c004b32478..7effb4cd204 100644 --- a/llvm/Makefile.common +++ b/llvm/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: diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 5c004b32478..7effb4cd204 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -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: |
