Mercurial > hg > graal-jvmci-8

comparison make/bsd/makefiles/buildtree.make @ 4006:436b4a3231bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7098194: integrate macosx-port changes Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 2011.09.29. Reviewed-by: kvn, dholmes, never, phh Contributed-by: Christos Zoulas <christos@zoulas.com>, Greg Lewis <glewis@eyesbeyond.com>, Kurt Miller <kurt@intricatesoftware.com>, Alexander Strange <astrange@apple.com>, Mike Swingler <swingler@apple.com>, Roger Hoover <rhoover@apple.com>, Victor Hernandez <vhernandez@apple.com>, Pratik Solanki <psolanki@apple.com>
author dcubed
date Thu, 13 Oct 2011 09:35:42 -0700
parents f08d439fab8c
children 95009f678859
comparison
equal deleted inserted replaced
4005:2ef3386478e6 4006:436b4a3231bf
112 endif 112 endif
113 113
114 # Get things from the platform file. 114 # Get things from the platform file.
115 COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE)) 115 COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
116 116
117 # dtracefiles is used on BSD versions that implement Dtrace (like MacOS X)
117 SIMPLE_DIRS = \ 118 SIMPLE_DIRS = \
118 $(PLATFORM_DIR)/generated/dependencies \ 119 $(PLATFORM_DIR)/generated/dependencies \
119 $(PLATFORM_DIR)/generated/adfiles \ 120 $(PLATFORM_DIR)/generated/adfiles \
120 $(PLATFORM_DIR)/generated/jvmtifiles 121 $(PLATFORM_DIR)/generated/jvmtifiles \
122 $(PLATFORM_DIR)/generated/dtracefiles
121 123
122 TARGETS = debug fastdebug jvmg optimized product profiled 124 TARGETS = debug fastdebug jvmg optimized product profiled
123 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS)) 125 SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
124 126
125 # For dependencies and recursive makes. 127 # For dependencies and recursive makes.
126 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make 128 BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
127 129
128 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \ 130 # dtrace.make is used on BSD versions that implement Dtrace (like MacOS X)
131 BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make \
132 jvmti.make sa.make dtrace.make \
129 env.sh env.csh jdkpath.sh .dbxrc test_gamma 133 env.sh env.csh jdkpath.sh .dbxrc test_gamma
130 134
131 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \ 135 BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
132 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT) 136 SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
133 137
151 ifeq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true) 155 ifeq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
152 include $(GAMMADIR)/make/hotspot_distro 156 include $(GAMMADIR)/make/hotspot_distro
153 else 157 else
154 include $(GAMMADIR)/make/openjdk_distro 158 include $(GAMMADIR)/make/openjdk_distro
155 endif 159 endif
160 endif
161
162 # MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
163 ifdef ALWAYS_PASS_TEST_GAMMA
164 TEST_GAMMA_STATUS= echo 'exit 0';
165 else
166 TEST_GAMMA_STATUS=
156 endif 167 endif
157 168
158 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) 169 BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
159 170
160 BUILDTREE = \ 171 BUILDTREE = \
312 echo include flags.make; \ 323 echo include flags.make; \
313 echo; \ 324 echo; \
314 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \ 325 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
315 ) > $@ 326 ) > $@
316 327
328 dtrace.make: $(BUILDTREE_MAKE)
329 @echo Creating $@ ...
330 $(QUIETLY) ( \
331 $(BUILDTREE_COMMENT); \
332 echo; \
333 echo include flags.make; \
334 echo; \
335 echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
336 ) > $@
337
317 env.sh: $(BUILDTREE_MAKE) 338 env.sh: $(BUILDTREE_MAKE)
318 @echo Creating $@ ... 339 @echo Creating $@ ...
319 $(QUIETLY) ( \ 340 $(QUIETLY) ( \
320 $(BUILDTREE_COMMENT); \ 341 $(BUILDTREE_COMMENT); \
321 [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ 342 [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
388 @echo Creating $@ ... 409 @echo Creating $@ ...
389 $(QUIETLY) ( \ 410 $(QUIETLY) ( \
390 echo '#!/bin/sh'; \ 411 echo '#!/bin/sh'; \
391 $(BUILDTREE_COMMENT); \ 412 $(BUILDTREE_COMMENT); \
392 echo '. ./env.sh'; \ 413 echo '. ./env.sh'; \
393 echo "exit 0;"; \
394 echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \ 414 echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
395 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \ 415 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
396 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \ 416 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
397 echo "then"; \ 417 echo "then"; \
398 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ 418 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
399 echo "fi"; \ 419 echo "fi"; \
400 echo "rm -f Queens.class"; \ 420 echo "rm -f Queens.class"; \
401 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \ 421 echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
402 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ 422 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
403 echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \ 423 echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
424 $(TEST_GAMMA_STATUS) \
404 ) > $@ 425 ) > $@
405 $(QUIETLY) chmod +x $@ 426 $(QUIETLY) chmod +x $@
406 427
407 FORCE: 428 FORCE:
408 429