mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-30 19:35:54 +00:00
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
This commit is contained in:
parent
c137b3043f
commit
e430a1eefb
@ -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:
|
||||
|
@ -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:
|
||||
|
Loading…
x
Reference in New Issue
Block a user