aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2016-01-11 16:47:54 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-01-11 20:03:07 +0000
commit7a02e5dd11f6d74d4665d7d331590a376f8f4e61 (patch)
tree9e856bd64d7817c6acf6d7b8e687c2c0210b62aa /scripts
parenta327faeb91922bca307f28a4ce7930db87cc3548 (diff)
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
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/build.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index ac1d52095a..df7e794b39 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