Mercurial > hg > graal-jvmci-8
changeset 22765:61cc3ee666d2
Perform a clean in jvmci.make when main clean target is called as well
| author | Stefan Anzinger <stefan.anzinger@oracle.com> |
|---|---|
| date | Mon, 11 Jan 2016 15:10:32 +0100 |
| parents | 9c0966b935a9 |
| children | 7d02b4097309 |
| files | make/Makefile make/defs.make |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Makefile Fri Jan 08 23:45:00 2016 +0100 +++ b/make/Makefile Mon Jan 11 15:10:32 2016 +0100 @@ -307,15 +307,11 @@ $(MAKE) -f $(ABS_OS_MAKEFILE) \ $(MAKE_ARGS) $(VM_TARGET) +cleanshared: + $(call jvmci-make,clean) buildshared: - cd .. && \ - $(MAKE) -f make/jvmci.make \ - TARGET=build/jvmci.make \ - HS_COMMON_SRC=$(HS_COMMON_SRC) \ - ABS_BOOTDIR=$(ABS_BOOTDIR) \ - SHARED_DIR=$(SHARED_DIR) \ - MAKE_VERBOSE=$(MAKE_VERBOSE) export + $(call jvmci-make,export) # Export file rule generic_export: $(EXPORT_LIST) @@ -671,7 +667,7 @@ # # Clean rules # -clobber clean: clean_build clean_export clean_jdk +clobber clean: clean_build clean_export clean_jdk cleanshared clean_build: $(RM) -r $(SHARED_DIR) $(RM) -r $(C1_DIR)
--- a/make/defs.make Fri Jan 08 23:45:00 2016 +0100 +++ b/make/defs.make Mon Jan 11 15:10:32 2016 +0100 @@ -377,5 +377,15 @@ # done by verify_defs_make in jvmci.make EXPORT_LIST += $(CONDITIONAL_EXPORT_LIST) +define jvmci-make + cd .. && pwd && \ + $(MAKE) -f make/jvmci.make \ + TARGET=build/jvmci.make \ + HS_COMMON_SRC=$(HS_COMMON_SRC) \ + ABS_BOOTDIR=$(ABS_BOOTDIR) \ + SHARED_DIR=$(SHARED_DIR) \ + MAKE_VERBOSE=$(MAKE_VERBOSE) $(1) +endef + .PHONY: $(HS_ALT_MAKE)/defs.make