changeset 1201:201d4e235d59 jdk9-b36

Merge
author lana
date Thu, 16 Oct 2014 14:14:39 -0700
parents 8ef1dc220c0e 85402bfa30d9
children 151654ca7b0a 31d74c7cb71d
files
diffstat 2 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/make/MakeHelpers.gmk	Thu Oct 16 12:01:55 2014 -0700
+++ b/make/MakeHelpers.gmk	Thu Oct 16 14:14:39 2014 -0700
@@ -324,9 +324,10 @@
 	+($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix /$$(strip $3)/$$(strip $4)-$$(strip $1).gmk, \
 	        $(MAKE_DIR_LIST))))) \
 	    && $(MAKE) $(MAKE_ARGS) \
-	    -f $$(strip $4)-$$(strip $1).gmk \
-	    $$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
-	        $$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))))
+	        -f $$(strip $4)-$$(strip $1).gmk \
+	        $$(addprefix -I, $$(wildcard $(MAKE_DIR_LIST) \
+	            $$(addsuffix /$$(strip $3), $(MAKE_DIR_LIST)))) \
+	        MODULE=$$(strip $1))
 endef
 
 ################################################################################
--- a/modules.xml	Thu Oct 16 12:01:55 2014 -0700
+++ b/modules.xml	Thu Oct 16 14:14:39 2014 -0700
@@ -1491,16 +1491,6 @@
     </export>
   </module>
   <module>
-    <name>jdk.compact3</name>
-    <depend re-exports="true">java.compact3</depend>
-    <depend re-exports="true">java.smartcardio</depend>
-    <depend re-exports="true">jdk.httpserver</depend>
-    <depend re-exports="true">jdk.naming.dns</depend>
-    <depend re-exports="true">jdk.naming.rmi</depend>
-    <depend re-exports="true">jdk.sctp</depend>
-    <depend re-exports="true">jdk.security.auth</depend>
-  </module>
-  <module>
     <name>jdk.compiler</name>
     <depend>java.base</depend>
     <depend re-exports="true">java.compiler</depend>
@@ -1735,7 +1725,6 @@
     <depend>java.base</depend>
     <depend>java.desktop</depend>
     <depend>java.se</depend>
-    <depend>jdk.compact3</depend>
   </module>
   <module>
     <name>jdk.scripting.nashorn</name>