common/makefiles/Main.gmk

changeset 627
28071e4ca1de
parent 624
7ed0c9db6943
parent 619
76808fb4194a
child 635
907a926d3c96
child 645
5b0b6ef58dbf
child 883
e877cb3eb4d6
equal deleted inserted replaced
626:bebeaa04ab8e 627:28071e4ca1de
73 73
74 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 74 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
75 all: overlay-images 75 all: overlay-images
76 endif 76 endif
77 77
78 start-make: 78 # Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
79 # is up to date after changes to configure
80 $(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
81 @$(ECHO) ERROR: $(SPEC) is not up to date
82 @$(ECHO) Please rerun configure!
83 @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
84
85 start-make: $(SPEC)
79 @$(call AtMakeStart) 86 @$(call AtMakeStart)
80 87
81 langtools: langtools-only 88 langtools: langtools-only
82 langtools-only: start-make 89 langtools-only: start-make
83 @$(call TargetEnter) 90 @$(call TargetEnter)
171 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image 178 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
172 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) 179 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
173 180
174 test: start-make 181 test: start-make
175 @$(call TargetEnter) 182 @$(call TargetEnter)
176 @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true 183 @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
177 @$(call TargetExit) 184 @$(call TargetExit)
178 185
179 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 186 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
180 # used to track the exact sources used to build that image. 187 # used to track the exact sources used to build that image.
181 source-tips: $(OUTPUT_ROOT)/source_tips 188 source-tips: $(OUTPUT_ROOT)/source_tips

mercurial