comparison make/linux/makefiles/buildtree.make @ 2032:320ef6401fce

Merge
author ysr
date Thu, 16 Dec 2010 12:56:51 -0800
parents aa6e219afbf1
children 5d801e6b9a80 b92c45f2bc75
comparison
equal deleted inserted replaced
2031:36eef023306f 2032:320ef6401fce
122 122
123 # For dependencies and recursive makes. 123 # For dependencies and recursive makes.
124 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make 124 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
125 125
126 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \ 126 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
127 env.sh env.csh .dbxrc test_gamma 127 env.sh env.csh jdkpath.sh .dbxrc test_gamma
128 128
129 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 129 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
130 ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 130 ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
131 131
132 # Define variables to be set in flags.make. 132 # Define variables to be set in flags.make.
316 [ -n "$$JAVA_HOME" ] && \ 316 [ -n "$$JAVA_HOME" ] && \
317 { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \ 317 { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \
318 sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \ 318 sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \
319 ) > $@ 319 ) > $@
320 320
321 jdkpath.sh: $(BUILDTREE_MAKE)
322 @echo Creating $@ ...
323 $(QUIETLY) ( \
324 $(BUILDTREE_COMMENT); \
325 echo "JDK=${JAVA_HOME}"; \
326 ) > $@
327
321 .dbxrc: $(BUILDTREE_MAKE) 328 .dbxrc: $(BUILDTREE_MAKE)
322 @echo Creating $@ ... 329 @echo Creating $@ ...
323 $(QUIETLY) ( \ 330 $(QUIETLY) ( \
324 echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \ 331 echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \
325 echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \ 332 echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \