comparison make/Makefile @ 16327:5f01f7c48d40

Merge with 5cdcb94a7cf7d9782107cc582f3e4b50000d5d1f
author Stefan Anzinger <stefan.anzinger@gmail.com>
date Mon, 30 Jun 2014 12:02:19 +0200
parents 942e4b7712e1
children b03a16cc5245
comparison
equal deleted inserted replaced
16326:51f392557124 16327:5f01f7c48d40
191 $(CD) $(GAMMADIR)/make; \ 191 $(CD) $(GAMMADIR)/make; \
192 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT) 192 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT)
193 193
194 $(GRAAL_VM_TARGETS): 194 $(GRAAL_VM_TARGETS):
195 $(CD) $(GAMMADIR)/make; \ 195 $(CD) $(GAMMADIR)/make; \
196 $(MAKE) BUILD_DIR=$(GRAAL_DIR) BUILD_FLAVOR=$(@:%graal=%) VM_TARGET=$@ generic_buildgraal $(ALT_OUT) 196 $(MAKE) BUILD_DIR=$(GRAAL_DIR) BUILD_FLAVOR=$(@:%graal=%) VM_TARGET=$@ INCLUDE_GRAAL=true generic_buildgraal $(ALT_OUT)
197 197
198 # Install hotspot script in build directory 198 # Install hotspot script in build directory
199 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot 199 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot
200 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script 200 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script
201 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR) 201 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR)