From 7a02e5dd11f6d74d4665d7d331590a376f8f4e61 Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Mon, 11 Jan 2016 16:47:54 +0000 Subject: [PATCH] Fix installer under OS X The installer was missing the StdRedirect.dylib after a recent change. This was breaking the Tutorial job on ci.bazel.io (and iOS builds using that installer). -- MOS_MIGRATED_REVID=111855462 --- scripts/ci/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index ac1d52095a5582..df7e794b3908a8 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -167,10 +167,16 @@ function bazel_build() { fi # Build the packages + local ARGS= + if [[ $PLATFORM == "darwin" ]] && \ + xcodebuild -showsdks 2> /dev/null | grep -q '\-sdk iphonesimulator'; then + ARGS="--define IPHONE_SDK=1" + fi ./output/bazel --bazelrc=${BAZELRC:-/dev/null} --nomaster_bazelrc build \ --embed_label=${release_label} --stamp \ --workspace_status_command=scripts/ci/build_status_command.sh \ --define JAVA_VERSION=${JAVA_VERSION} \ + ${ARGS} \ //scripts/packages/... || exit $? if [ -n "${1-}" ]; then