Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/make/Makefile Thu Jun 20 11:17:47 2013 +0200 +++ b/make/Makefile Thu Jun 20 13:47:53 2013 +0200 @@ -167,6 +167,7 @@ MINIMAL1_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1 ZERO_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_zero SHARK_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_shark +GRAAL_DIR =$(OUTPUTDIR)/$(VM_PLATFORM)_graal # Build variation of hotspot $(C1_VM_TARGETS): @@ -189,6 +190,10 @@ $(CD) $(GAMMADIR)/make; \ $(MAKE) BUILD_DIR=$(MINIMAL1_DIR) BUILD_FLAVOR=$(@:%minimal1=%) VM_TARGET=$@ generic_buildminimal1 $(ALT_OUT) +$(GRAAL_VM_TARGETS): + $(CD) $(GAMMADIR)/make; \ + $(MAKE) BUILD_DIR=$(GRAAL_DIR) BUILD_FLAVOR=$(@:%graal=%) VM_TARGET=$@ generic_buildgraal $(ALT_OUT) + # Install hotspot script in build directory HOTSPOT_SCRIPT=$(BUILD_DIR)/$(BUILD_FLAVOR)/hotspot $(HOTSPOT_SCRIPT): $(GAMMADIR)/make/hotspot.script @@ -196,11 +201,6 @@ $(QUIETLY) cat $< | sed -e 's|@@LIBARCH@@|$(LIBARCH)|g' | sed -e 's|@@JDK_IMPORT_PATH@@|$(JDK_IMPORT_PATH)|g' > $@ $(QUIETLY) chmod +x $@ -$(GRAAL_VM_TARGETS): - $(CD) $(GAMMADIR)/make; \ - $(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ \ - generic_buildgraal $(ALT_OUT) - # Build compiler1 (client) rule, different for platforms generic_build1: $(HOTSPOT_SCRIPT) buildshared $(MKDIR) -p $(OUTPUTDIR) @@ -272,7 +272,7 @@ @$(ECHO) "Error: trying to build a minimal target but JVM_VARIANT_MINIMAL1 is not true." endif -generic_buildgraal: buildshared +generic_buildgraal: $(HOTSPOT_SCRIPT) buildshared $(MKDIR) -p $(OUTPUTDIR) $(CD) $(OUTPUTDIR); \ $(MAKE) -f $(ABS_OS_MAKEFILE) \