Mercurial > hg > truffle
comparison make/Makefile @ 10429:113c00c4def2
fix recent merge with hsx (Mac build problems)
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Thu, 20 Jun 2013 13:47:53 +0200 |
parents | 836a62f43af9 |
children | fb95519008d6 |
comparison
equal
deleted
inserted
replaced
10428:6188764e66af | 10429:113c00c4def2 |
---|---|
165 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 | 165 C1_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1 |
166 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 | 166 C2_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2 |
167 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 | 167 MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 |
168 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero | 168 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero |
169 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark | 169 SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark |
170 GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal | |
170 | 171 |
171 # Build variation of hotspot | 172 # Build variation of hotspot |
172 $(C1_VM_TARGETS): | 173 $(C1_VM_TARGETS): |
173 $(CD) $(GAMMADIR)/make; \ | 174 $(CD) $(GAMMADIR)/make; \ |
174 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) | 175 $(MAKE) BUILD_DIR=$(C1_DIR) BUILD_FLAVOR=$(@:%1=%) VM_TARGET=$@ generic_build1 $(ALT_OUT) |
186 $(MAKE) BUILD_DIR=$(SHARK_DIR) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ generic_buildshark $(ALT_OUT) | 187 $(MAKE) BUILD_DIR=$(SHARK_DIR) BUILD_FLAVOR=$(@:%shark=%) VM_TARGET=$@ generic_buildshark $(ALT_OUT) |
187 | 188 |
188 $(MINIMAL1_VM_TARGETS): | 189 $(MINIMAL1_VM_TARGETS): |
189 $(CD) $(GAMMADIR)/make; \ | 190 $(CD) $(GAMMADIR)/make; \ |
190 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT) | 191 $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT) |
192 | |
193 $(GRAAL_VM_TARGETS): | |
194 $(CD) $(GAMMADIR)/make; \ | |
195 $(MAKE) BUILD_DIR=$(GRAAL_DIR) BUILD_FLAVOR=$(@:%graal=%) VM_TARGET=$@ generic_buildgraal $(ALT_OUT) | |
191 | 196 |
192 # Install hotspot script in build directory | 197 # Install hotspot script in build directory |
193 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot | 198 HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot |
194 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script | 199 $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script |
195 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR) | 200 $(QUIETLY) $(MKDIR) -p $(BUILD_DIR)/$(BUILD_FLAVOR) |
196 $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@ | 201 $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@ |
197 $(QUIETLY) chmod +x $@ | 202 $(QUIETLY) chmod +x $@ |
198 | |
199 $(GRAAL_VM_TARGETS): | |
200 $(CD) $(GAMMADIR)/make; \ | |
201 $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ \ | |
202 generic_buildgraal $(ALT_OUT) | |
203 | 203 |
204 # Build compiler1 (client) rule, different for platforms | 204 # Build compiler1 (client) rule, different for platforms |
205 generic_build1: $(HOTSPOT_SCRIPT) buildshared | 205 generic_build1: $(HOTSPOT_SCRIPT) buildshared |
206 $(MKDIR) -p $(OUTPUTDIR) | 206 $(MKDIR) -p $(OUTPUTDIR) |
207 ifeq ($(OSNAME),windows) | 207 ifeq ($(OSNAME),windows) |
270 endif | 270 endif |
271 else | 271 else |
272 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." | 272 @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." |
273 endif | 273 endif |
274 | 274 |
275 generic_buildgraal: buildshared | 275 generic_buildgraal: $(HOTSPOT_SCRIPT) buildshared |
276 $(MKDIR) -p $(OUTPUTDIR) | 276 $(MKDIR) -p $(OUTPUTDIR) |
277 $(CD) $(OUTPUTDIR); \ | 277 $(CD) $(OUTPUTDIR); \ |
278 $(MAKE) -f $(ABS_OS_MAKEFILE) \ | 278 $(MAKE) -f $(ABS_OS_MAKEFILE) \ |
279 $(MAKE_ARGS) $(VM_TARGET) | 279 $(MAKE_ARGS) $(VM_TARGET) |
280 | 280 |