common/conf/jib-profiles.js

@@ -217,11 +217,11 @@
     common.dependencies = ["boot_jdk", "gnumake", "jtreg"],
     common.default_make_targets = ["product-images", "test-image"],
     common.default_make_targets_debug = common.default_make_targets;
     common.default_make_targets_slowdebug = common.default_make_targets;
     common.configure_args = ["--enable-jtreg-failure-handler"],
-    common.configure_args_32bit = ["--with-target-bits=32", "--with-jvm-variants=client,server"],
+    common.configure_args_32bit = ["--with-target-bits=32"],
     common.configure_args_debug = ["--enable-debug"],
     common.configure_args_slowdebug = ["--with-debug-level=slowdebug"],
     common.organization = "jpg.infra.builddeps"
 
     return common;

@@ -252,11 +252,11 @@
             target_os: "linux",
             target_cpu: "x86",
             build_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit"),
             configure_args: concat(common.configure_args, common.configure_args_32bit,
-                "--with-zlib=system"),
+                "--with-jvm-variants=minimal,client,server", "--with-zlib=system"),
             default_make_targets: common.default_make_targets
         },
 
         "macosx-x64": {
             target_os: "macosx",

@@ -293,11 +293,12 @@
         "windows-x86": {
             target_os: "windows",
             target_cpu: "x86",
             build_cpu: "x64",
             dependencies: concat(common.dependencies, "devkit", "freetype"),
-            configure_args: concat(common.configure_args, common.configure_args_32bit),
+            configure_args: concat(common.configure_args,
+                "--with-jvm-variants=client,server", common.configure_args_32bit),
             default_make_targets: common.default_make_targets
         }
     };
     profiles = concatObjects(profiles, mainProfiles);
     // Generate debug versions of all the main profiles