- Makefile changes:

   - Now build executables into /shared
   - New BUILD_ROOT_TOP variable which is basically = $(BUILD_ROOT)/$(LEVEL) but
     cleaner and works for llvm/test/*
   - Use := more in Makefile.common


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3291 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 38 insertions, 27 deletions

diff --git a/Makefile.rules b/Makefile.rules
index 5873cfbe2b..2c5f9310c0 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -61,10 +61,22 @@ install ::
 # /shared directory by default because it is guaranteed to be local to the
 # current machine.
 #
-ifndef BUILD_ROOT
+ifdef BUILD_ROOT
+BUILD_ROOT_TOP := $(LEVEL)
+else
+
 LOGIN_NAME := $(shell whoami)
 CUR_DIRECTORY := $(shell pwd)
 BUILD_ROOT := /shared/$(LOGIN_NAME)$(patsubst $(HOME)%,%,$(CUR_DIRECTORY))
+
+# Calculate the BUILD_ROOT_TOP variable, which is the top of the llvm/ tree.
+# Note that although this is just equal to $(BUILD_ROOT)/$(LEVEL), we cannot use
+# this expression because some of the directories on the source tree may not
+# exist in the build tree (for example the test/ heirarchy).  Thus we evaluate
+# the directory to eliminate the ../'s
+#
+TOP_DIRECTORY := $(shell cd $(LEVEL); pwd)
+BUILD_ROOT_TOP := /shared/$(LOGIN_NAME)$(patsubst $(HOME)%,%,$(TOP_DIRECTORY))
 endif
 
 #--------------------------------------------------------------------
@@ -82,17 +94,17 @@ BURG_OPTS = -I
 PURIFY = /usr/dcs/applications/purify/bin/purify -cache-dir="$(HOME)/purifycache" -chain-length="30" -messages=all 
 
 # Shorthand for commonly accessed directories
-LIBDEBUG    = $(BUILD_ROOT)/$(LEVEL)/lib/Debug
-LIBRELEASE  = $(BUILD_ROOT)/$(LEVEL)/lib/Release
-TOOLDEBUG   = $(BUILD_ROOT)/$(LEVEL)/tools/Debug
-TOOLRELEASE = $(BUILD_ROOT)/$(LEVEL)/tools/Release
+LIBDEBUG    := $(BUILD_ROOT_TOP)/lib/Debug
+LIBRELEASE  := $(BUILD_ROOT_TOP)/lib/Release
+TOOLDEBUG   := $(BUILD_ROOT_TOP)/tools/Debug
+TOOLRELEASE := $(BUILD_ROOT_TOP)/tools/Release
 
 #---------------------------------------------------------
 # Compilation options...
 #---------------------------------------------------------
 
 # Special tools used while building
-RunBurg  = $(BURG) $(BURG_OPTS)
+RunBurg  := $(BURG) $(BURG_OPTS)
 
 # Enable this for profiling support with 'gprof'
 ifdef ENABLE_PROFILING
@@ -102,37 +114,36 @@ PROFILE =
 endif
 
 # -Wno-unused-parameter
-CompileCommonOpts = $(PROFILE) -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
+CompileCommonOpts := $(PROFILE) -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 
 # Compile a file, don't link...
-Compile  = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
-CompileG = $(Compile) -g  -D_DEBUG
-CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
+Compile  := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
+CompileG := $(Compile) -g  -D_DEBUG
+CompileO := $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnonnull-objects -freg-struct-return -fshort-enums
 
 # Link final executable
 
 ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
-Link     = $(PURIFY) $(CXX) $(PROFILE) -static
+Link     := $(PURIFY) $(CXX) $(PROFILE) -static
 else
-Link     = $(CXX) $(PROFILE)
+Link     := $(CXX) $(PROFILE)
 endif
-LinkG    = $(Link) -g  -L $(LIBDEBUG)
-LinkO    = $(Link) -O3 -L $(LIBRELEASE)
+LinkG    := $(Link) -g  -L $(LIBDEBUG)
+LinkO    := $(Link) -O3 -L $(LIBRELEASE)
 
 # Create a .so file from a .o files...
-#MakeSO   = $(CXX) -shared $(PROFILE)
-MakeSO   = $(CXX) -G $(PROFILE)
-MakeSOO  = $(MakeSO) -O3
+#MakeSO   := $(CXX) -shared $(PROFILE)
+MakeSO   := $(CXX) -G $(PROFILE)
+MakeSOO  := $(MakeSO) -O3
 
 # Create one .o file from a bunch of .o files...
 Relink = ld -r
 
 # Create dependancy file from CPP file, send to stdout.
-Depend   = $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) 
+Depend   := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) 
 
 # Archive a bunch of .o files into a .a file...
 AR       = ar cq 
-MakeLib   = $(AR)
 
 #----------------------------------------------------------
 
@@ -224,12 +235,12 @@ $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(LIBDEBUG)/.dir
 $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(LIBRELEASE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) release library =======
 	@rm -f $@
-	$(MakeLib) $@ $(ObjectsO) $(LibSubDirs)
+	$(AR) $@ $(ObjectsO) $(LibSubDirs)
 
 $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(LIBDEBUG)/.dir
 	@echo ======= Linking $(LIBRARYNAME) debug library =======
 	@rm -f $@
-	$(MakeLib) $@ $(ObjectsG) $(LibSubDirs)
+	$(AR) $@ $(ObjectsG) $(LibSubDirs)
 
 $(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(LIBRELEASE)/.dir
 	$(Relink) -o $@ $(ObjectsO) $(LibSubDirs)
@@ -261,9 +272,9 @@ endif
 ifdef TOOLNAME
 
 # TOOLEXENAME* - These compute the output filenames to generate...
-TOOLEXENAME_G = $(LEVEL)/tools/Debug/$(TOOLNAME)
-TOOLEXENAME_O = $(LEVEL)/tools/Release/$(TOOLNAME)
-TOOLEXENAMES := $(TOOLEXENAME_G)
+TOOLEXENAME_G := $(BUILD_ROOT_TOP)/tools/Debug/$(TOOLNAME)
+TOOLEXENAME_O := $(BUILD_ROOT_TOP)/tools/Release/$(TOOLNAME)
+TOOLEXENAMES  := $(TOOLEXENAME_G)
 ifdef ENABLE_OPTIMIZED
 TOOLEXENAMES += $(TOOLEXENAME_O)
 endif
@@ -286,10 +297,10 @@ all::   $(TOOLEXENAMES)
 clean::
 	rm -f $(TOOLEXENAMES)
 
-$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir
+$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(BUILD_ROOT_TOP)/tools/Debug/.dir
 	$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_G) $(TOOLLINKOPTS)
 
-$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir
+$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(BUILD_ROOT_TOP)/tools/Release/.dir
 	$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS_O) $(TOOLLINKOPTS)
 
 endif
@@ -346,7 +357,7 @@ clean::
 # If dependancies were generated for the file that included this file,
 # include the dependancies now...
 #
-SourceDepend = $(addsuffix .d,$(addprefix $(BUILD_ROOT)/Depend/,$(basename $(filter-out Debug/%, $(Source)))))
+SourceDepend := $(addsuffix .d,$(addprefix $(BUILD_ROOT)/Depend/,$(basename $(filter-out Debug/%, $(Source)))))
 ifneq ($(SourceDepend),)
 include $(SourceDepend)
 endif