Skip to content
This repository was archived by the owner on Apr 30, 2020. It is now read-only.

Commit fc548ab

Browse files
committed
In Jenkins script, only set JAVA_HOME if it hasn't already been set
1 parent bb5ba93 commit fc548ab

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

CodeXL/Util/linux/JenkinsCodeXLFullBuild

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ CODEXL_HELP_FOLDER=${AMD_BRANCH_ROOT}/CodeXL/Help
2828
CODEXL_COMMON_DIR=${AMD_PERFORCE_ROOT}/Common/
2929

3030
# Set Java_Home locally
31-
export JAVA_HOME=/opt/java/jdk1.8.0_77
31+
if [ -z ${JAVA_HOME+x} ]
32+
then
33+
export JAVA_HOME=/opt/java/jdk1.8.0_77
34+
fi
3235

3336
# NOTE: This is used by buildCodeXLFullLinuxProjects
3437
export AMD_CODEXL=$AMD_BRANCH_ROOT/CodeXL

0 commit comments

Comments
 (0)