Mercurial > hg > graal-compiler
diff make/defs.make @ 91:a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
Summary: Moved makefiles out of build and build/closed into make/
Reviewed-by: kvn, ohair
| author | kamg |
|---|---|
| date | Wed, 09 Apr 2008 14:22:48 -0400 |
| parents | a61af66fc99e |
| children | d1605aabd0a1 6470a2a42f92 |
line wrap: on
line diff
--- a/make/defs.make Fri Apr 04 10:48:43 2008 -0400 +++ b/make/defs.make Wed Apr 09 14:22:48 2008 -0400 @@ -57,6 +57,7 @@ # When the tree of subdirs is built, this setting is stored in each flags.make. GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done) HS_SRC_DIR=$(GAMMADIR)/src +HS_MAKE_DIR=$(GAMMADIR)/make HS_BUILD_DIR=$(GAMMADIR)/build ifeq ($(USER),) @@ -170,17 +171,17 @@ # The platform dependent defs.make defines platform specific variable such # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. -include $(GAMMADIR)/build/$(OSNAME)/makefiles/defs.make +include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make # We are trying to put platform specific defintions -# files to build/$(OSNAME)/makefiles dictory. However +# files to make/$(OSNAME)/makefiles dictory. However # some definitions are common for both linux and solaris, # so we put them here. ifneq ($(OSNAME),windows) - ABS_OUTPUTDIR := $(shell $(CD) $(OUTPUTDIR); $(PWD)) + ABS_OUTPUTDIR := $(shell mkdir -p $(OUTPUTDIR); $(CD) $(OUTPUTDIR); $(PWD)) ABS_BOOTDIR := $(shell $(CD) $(BOOTDIR); $(PWD)) ABS_GAMMADIR := $(shell $(CD) $(GAMMADIR); $(PWD)) - ABS_OS_MAKEFILE := $(shell $(CD) $(HS_BUILD_DIR)/$(OSNAME); $(PWD))/Makefile + ABS_OS_MAKEFILE := $(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME); $(PWD))/Makefile # uname, HotSpot source directory, build directory and JDK use different names # for CPU architectures.