6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 04:33:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix computation of LLVM_OBJ_ROOT for non-projects :(

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@8046 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-08-22 05:18:49 +00:00
parent da228ef560
commit f0f463eb63
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.common
View File

@ -115,6 +115,17 @@ BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
endif endif
endif endif
#
# Set the LLVM object directory.
#
ifndef LLVM_OBJ_ROOT
ifdef LLVM_SRC_ROOT
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
else
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LEVEL); pwd)
endif
endif
# #
# Set the LLVM source directory. # Set the LLVM source directory.
# It is typically the root directory of what we're compiling now. # It is typically the root directory of what we're compiling now.
@ -123,13 +134,6 @@ ifndef LLVM_SRC_ROOT
LLVM_SRC_ROOT := $(BUILD_SRC_ROOT) LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
endif endif
#
# Set the LLVM object directory.
#
ifndef LLVM_OBJ_ROOT
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
endif
########################################################################### ###########################################################################
# Default Targets: # Default Targets:
# The following targets are the standard top level targets for # The following targets are the standard top level targets for

18
Makefile.rules
View File

@ -115,6 +115,17 @@ BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
endif endif
endif endif
#
# Set the LLVM object directory.
#
ifndef LLVM_OBJ_ROOT
ifdef LLVM_SRC_ROOT
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
else
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LEVEL); pwd)
endif
endif
# #
# Set the LLVM source directory. # Set the LLVM source directory.
# It is typically the root directory of what we're compiling now. # It is typically the root directory of what we're compiling now.
@ -123,13 +134,6 @@ ifndef LLVM_SRC_ROOT
LLVM_SRC_ROOT := $(BUILD_SRC_ROOT) LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
endif endif
#
# Set the LLVM object directory.
#
ifndef LLVM_OBJ_ROOT
LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
endif
########################################################################### ###########################################################################
# Default Targets: # Default Targets:
# The following targets are the standard top level targets for # The following targets are the standard top level targets for