Merge
authorsla
Tue, 28 Apr 2015 20:02:31 +0200
changeset 30570 bc171531c562
parent 30568 d0a24d56d8ea (current diff)
parent 30569 28d0b4c56125 (diff)
child 30572 3d36f972d68b
Merge
--- a/hotspot/test/Makefile	Tue Apr 28 12:17:56 2015 +0000
+++ b/hotspot/test/Makefile	Tue Apr 28 20:02:31 2015 +0200
@@ -28,8 +28,6 @@
 
 ALT_MAKE ?= closed
 
--include $(ALT_MAKE)/Makefile
-
 GETMIXEDPATH=echo
 
 # Utilities used
@@ -304,6 +302,8 @@
 endif
 JTREG_BASIC_OPTIONS += $(JTREG_KEY_OPTION)
 
+-include $(ALT_MAKE)/Makefile
+
 # Make sure jtreg exists
 $(JTREG): $(JT_HOME)