changeset 2129:346be2df0f5b jdk-9+122

Merge
author amurillo
date Mon, 06 Jun 2016 09:58:03 -0700
parents a99e80345331 a4d461b24f3a
children 4a42f568149c 89769a2f1511 bf3f3929f5f6
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jun 02 14:58:48 2016 -0700
+++ b/.hgtags	Mon Jun 06 09:58:03 2016 -0700
@@ -363,3 +363,4 @@
 047f95de8f918d8ff5e8cd2636a2abb5c3c8adb8 jdk-9+118
 3463a3f14f0f0e8a68f29ac6405454f2fa2f598a jdk-9+119
 647e0142a5a52749db572b5e6638d561def6479e jdk-9+120
+cae471d3b87783e0a3deea658e1e1c84b2485b6c jdk-9+121
--- a/common/conf/jib-profiles.js	Thu Jun 02 14:58:48 2016 -0700
+++ b/common/conf/jib-profiles.js	Mon Jun 06 09:58:03 2016 -0700
@@ -318,7 +318,8 @@
         },
 
         "linux-x86-open": {
-            default_make_targets: "profiles"
+            default_make_targets: "profiles",
+            configure_args: "--with-jvm-variants=client,server"
         }
     };
     var openOnlyProfiles = concatObjects(openOnlyProfiles, openOnlyProfilesExtra);