Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8193060: Set MAKE env variable in jib profile for gnumake
authorihse
Wed, 06 Dec 2017 13:47:35 +0100
changeset 48079 eaa406097d93
parent 48078 94a38ebbc9bb
child 48080 18a4438eb690
child 55967 e2c47e2db0a5
8193060: Set MAKE env variable in jib profile for gnumake Reviewed-by: tbell, erikj
make/conf/jib-profiles.js file | annotate | diff | comparison | revisions 
--- a/make/conf/jib-profiles.js	Wed Dec 06 13:45:46 2017 +0100
+++ b/make/conf/jib-profiles.js	Wed Dec 06 13:47:35 2017 +0100
@@ -779,6 +779,10 @@
         macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0"
     }[input.target_platform];
 
+    var makeBinDir = (input.build_os == "windows"
+        ? input.get("gnumake", "install_path") + "/cygwin/bin"
+        : input.get("gnumake", "install_path") + "/bin");
+
     var dependencies = {
 
         boot_jdk: {
@@ -831,13 +835,13 @@
                 ? "gnumake-" + input.build_osenv_platform
                 : "gnumake-" + input.build_platform),
 
-            configure_args: (input.build_os == "windows"
-                ? "MAKE=" + input.get("gnumake", "install_path") + "/cygwin/bin/make"
-                : "MAKE=" + input.get("gnumake", "install_path") + "/bin/make"),
+            configure_args: "MAKE=" + makeBinDir + "/make",
 
-            environment_path: (input.build_os == "windows"
-                ? input.get("gnumake", "install_path") + "/cygwin/bin"
-                : input.get("gnumake", "install_path") + "/bin")
+            environment: {
+                "MAKE": makeBinDir + "/make"
+            },
+
+            environment_path: makeBinDir
         },
 
         freetype: {
jdk-sandbox