equal
deleted
inserted
replaced
385 var boot_jdk_subdirpart = "1.8.0"; |
385 var boot_jdk_subdirpart = "1.8.0"; |
386 // JDK 8 does not work on sparc M7 cpus, need a newer update when building |
386 // JDK 8 does not work on sparc M7 cpus, need a newer update when building |
387 // on such hardware. |
387 // on such hardware. |
388 if (input.build_cpu == "sparcv9") { |
388 if (input.build_cpu == "sparcv9") { |
389 var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); |
389 var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); |
390 if (cpu_brand.trim().match('SPARC-.7')) { |
390 if (cpu_brand.trim().match('SPARC-.[78]')) { |
391 boot_jdk_revision = "8u20"; |
391 boot_jdk_revision = "8u20"; |
392 boot_jdk_subdirpart = "1.8.0_20"; |
392 boot_jdk_subdirpart = "1.8.0_20"; |
393 } |
393 } |
394 } |
394 } |
395 common.boot_jdk_revision = boot_jdk_revision; |
395 common.boot_jdk_revision = boot_jdk_revision; |