# HG changeset patch
# User ihse
# Date 1512564455 -3600
# Node ID eaa406097d93a5de903561ce5eb05fa8681f183c
# Parent  94a38ebbc9bb1e96b05ede2199c8871fceb0459a
8193060: Set MAKE env variable in jib profile for gnumake
Reviewed-by: tbell, erikj

diff -r 94a38ebbc9bb -r eaa406097d93 make/conf/jib-profiles.js
--- 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: {