1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8193060: Set MAKE env variable in jib profile for gnumake

Browse Source 
Reviewed-by: tbell, erikj
This commit is contained in:
Magnus Ihse Bursie 2017-12-06 13:47:35 +01:00
parent 5ea9e32d6c
commit a923e57c7b
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/conf/jib-profiles.js
View File

@ -779,6 +779,10 @@ var getJibProfilesDependencies = function (input, common) {
macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0" macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0"
}[input.target_platform]; }[input.target_platform];
var makeBinDir = (input.build_os == "windows"
? input.get("gnumake", "install_path") + "/cygwin/bin"
: input.get("gnumake", "install_path") + "/bin");
var dependencies = { var dependencies = {
boot_jdk: { boot_jdk: {
@ -831,13 +835,13 @@ var getJibProfilesDependencies = function (input, common) {
? "gnumake-" + input.build_osenv_platform ? "gnumake-" + input.build_osenv_platform
: "gnumake-" + input.build_platform), : "gnumake-" + input.build_platform),
configure_args: (input.build_os == "windows" configure_args: "MAKE=" + makeBinDir + "/make",
? "MAKE=" + input.get("gnumake", "install_path") + "/cygwin/bin/make"
: "MAKE=" + input.get("gnumake", "install_path") + "/bin/make"),
environment_path: (input.build_os == "windows" environment: {
? input.get("gnumake", "install_path") + "/cygwin/bin" "MAKE": makeBinDir + "/make"
: input.get("gnumake", "install_path") + "/bin") },
environment_path: makeBinDir
}, },
freetype: { freetype: {