diff options
| author | ohair <none@none> | 2010-06-21 11:00:15 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2010-06-21 11:00:15 -0700 |
| commit | 80800fe86ca39767daf3b26145cbc2cd992424a1 (patch) | |
| tree | 5788d5a94b69d3ce42b02709dc326d9a5cc741e7 /make | |
| parent | 208c1ef22eab08a3924e773f3db9f8fc2d70d119 (diff) | |
6960853: Cleanup makefiles, remove unused vars etc.
6959596: Windows fastdebug build broken
6960335: Add top level 'make test' rule that uses test/Makefile, runs all test batches
Reviewed-by: alanb
Diffstat (limited to 'make')
| -rw-r--r-- | make/Defs-internal.gmk | 1 | ||||
| -rw-r--r-- | make/jprt.gmk | 4 | ||||
| -rw-r--r-- | make/sanity-rules.gmk | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index f3c35bd..cab13f3 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -52,7 +52,6 @@ ifdef OPENJDK endif # Define absolute paths to TOPDIRs -ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)") ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)") ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)") diff --git a/make/jprt.gmk b/make/jprt.gmk index 6119177..57fd1d3 100644 --- a/make/jprt.gmk +++ b/make/jprt.gmk @@ -45,11 +45,11 @@ ifdef HAVE_JPRT_SAVE_BUNDLES endif jprt_build_fastdebug: fastdebug_build - ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) jprt_build_debug: debug_build - ( $(CD) $(OUTPUTDIR)-debug/j2sdk-image && \ + ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/j2sdk-image && \ $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) ################################################################ diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk index 88b4db5..6a17a5b 100644 --- a/make/sanity-rules.gmk +++ b/make/sanity-rules.gmk @@ -281,7 +281,6 @@ endif @$(ECHO) "Build Directory Structure:" >> $(MESSAGE_FILE) @$(ECHO) " CWD = `$(PWD)`" >> $(MESSAGE_FILE) @$(ECHO) " TOPDIR = $(TOPDIR)" >> $(MESSAGE_FILE) - @$(ECHO) " CONTROL_TOPDIR = $(CONTROL_TOPDIR)" >> $(MESSAGE_FILE) ifeq ($(LANGTOOLS_SRC_AVAILABLE), true) @$(ECHO) " LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)" >> $(MESSAGE_FILE) endif |