aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar László Csomor <laszlocsomor@google.com>2017-11-29 10:55:08 +0100
committerGravatar László Csomor <laszlocsomor@google.com>2017-11-29 10:55:08 +0100
commitefdb1a73edd66d8dfb3afffbc9766433ca889725 (patch)
treeb869bebb951e50cac17ce698e4c03eead59a42fa /third_party
parent9c78a79c02d38a98a38d852e10b16d8cb7a59c91 (diff)
parent8967bd35ceae945de070399f3d65f1475bcc68d1 (diff)
Merge commit 'refs/pull/4164/head' of https://github.com/bazelbuild/bazel into HEAD
Change-Id: Iafff106153aff96380837eddf771e572335c8798
Diffstat (limited to 'third_party')
-rwxr-xr-xthird_party/protobuf/3.4.0/objectivec/DevTools/full_mac_build.sh2
-rwxr-xr-xthird_party/protobuf/3.4.0/objectivec/Tests/CocoaPods/run_tests.sh2
-rwxr-xr-xthird_party/zlib/configure2
3 files changed, 3 insertions, 3 deletions
diff --git a/third_party/protobuf/3.4.0/objectivec/DevTools/full_mac_build.sh b/third_party/protobuf/3.4.0/objectivec/DevTools/full_mac_build.sh
index 159630e2c2..8fe750a09f 100755
--- a/third_party/protobuf/3.4.0/objectivec/DevTools/full_mac_build.sh
+++ b/third_party/protobuf/3.4.0/objectivec/DevTools/full_mac_build.sh
@@ -54,7 +54,7 @@ EOF
header() {
echo ""
echo "========================================================================"
- echo " ${@}"
+ echo " $*"
echo "========================================================================"
}
diff --git a/third_party/protobuf/3.4.0/objectivec/Tests/CocoaPods/run_tests.sh b/third_party/protobuf/3.4.0/objectivec/Tests/CocoaPods/run_tests.sh
index 6d3e12be30..fc281e4cf0 100755
--- a/third_party/protobuf/3.4.0/objectivec/Tests/CocoaPods/run_tests.sh
+++ b/third_party/protobuf/3.4.0/objectivec/Tests/CocoaPods/run_tests.sh
@@ -78,7 +78,7 @@ fi
header() {
echo ""
echo "========================================================================"
- echo " ${@}"
+ echo " $*"
echo "========================================================================"
echo ""
}
diff --git a/third_party/zlib/configure b/third_party/zlib/configure
index b77a8a8cf9..1d132b79d4 100755
--- a/third_party/zlib/configure
+++ b/third_party/zlib/configure
@@ -343,7 +343,7 @@ try()
( $* ) >> configure.log 2>&1
ret=$?
if test $ret -ne 0; then
- echo "(exit code "$ret")" >> configure.log
+ echo "(exit code $ret)" >> configure.log
fi
return $ret
}