Fix recently-introduced bug in ci_build.sh re. cmake builds (#4541)

Commit 4316aeb inadvertently made cmake builds depend on bazel. This change set removes the dependency.
This commit is contained in:
caisq 2016-09-23 02:05:15 -04:00 committed by Martin Wicke
parent 3c779046dd
commit 9c11fe2f1d

View File

@ -67,7 +67,6 @@ if [ "$#" -lt 1 ] || [ ! -e "${SCRIPT_DIR}/Dockerfile.${CONTAINER_TYPE}" ]; then
exit 1 exit 1
fi fi
# Optional arguments - environment variables. For example: # Optional arguments - environment variables. For example:
# CI_DOCKER_EXTRA_PARAMS='-it --rm' CI_COMMAND_PREFIX='' tensorflow/tools/ci_build/ci_build.sh CPU /bin/bash # CI_DOCKER_EXTRA_PARAMS='-it --rm' CI_COMMAND_PREFIX='' tensorflow/tools/ci_build/ci_build.sh CPU /bin/bash
CI_TENSORFLOW_SUBMODULE_PATH="${CI_TENSORFLOW_SUBMODULE_PATH:-.}" CI_TENSORFLOW_SUBMODULE_PATH="${CI_TENSORFLOW_SUBMODULE_PATH:-.}"
@ -79,6 +78,11 @@ if [[ ! -z "${TF_BUILD_DISABLE_GCP}" ]] &&
CI_COMMAND_PREFIX+=("--disable-gcp") CI_COMMAND_PREFIX+=("--disable-gcp")
fi fi
# cmake (CPU) builds do not require configuration.
if [[ "${CONTAINER_TYPE}" == "cmake" ]]; then
CI_COMMAND_PREFIX=""
fi
# Helper function to traverse directories up until given file is found. # Helper function to traverse directories up until given file is found.
function upsearch () { function upsearch () {
test / == "$PWD" && return || \ test / == "$PWD" && return || \