diff options
| author | Don Hinton <hintonda@gmail.com> | 2017-07-31 15:18:57 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2017-07-31 15:18:57 +0000 |
| commit | 1e4f60275f8ffc85772621215bf8ef78422364ae (patch) | |
| tree | b473350da824462defe8b18c3ee44e6c1b9e0c22 | |
| parent | 84ae3364df10bf2639ddb29025c3e8224e33cea1 (diff) | |
| download | bcm5719-llvm-1e4f60275f8ffc85772621215bf8ef78422364ae.tar.gz bcm5719-llvm-1e4f60275f8ffc85772621215bf8ef78422364ae.zip | |
[docker] Fix unmatched quote problem in here-document on older versions of bash
Summary:
When outputing usage, emit here-document directly instead of
saving in a variable first -- avoids problem with bash 3.2.57 where an
unmatched ' in the here-document results in the following error:
./build_docker_image.sh: line 135: unexpected EOF while looking for matching `''
bash --version
GNU bash, version 3.2.57(1)-release (x86_64-apple-darwin16)
Differential Revision: https://reviews.llvm.org/D36064
llvm-svn: 309568
| -rwxr-xr-x | llvm/utils/docker/build_docker_image.sh | 4 | ||||
| -rwxr-xr-x | llvm/utils/docker/scripts/build_install_llvm.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/llvm/utils/docker/build_docker_image.sh b/llvm/utils/docker/build_docker_image.sh index 33f690ad5c4..6556eac04fc 100755 --- a/llvm/utils/docker/build_docker_image.sh +++ b/llvm/utils/docker/build_docker_image.sh @@ -15,7 +15,7 @@ DOCKER_TAG="" BUILDSCRIPT_ARGS="" function show_usage() { - usage=$(cat << EOF + cat << EOF Usage: build_docker_image.sh [options] [-- [cmake_args]...] Available options: @@ -64,8 +64,6 @@ $ ./build_docker_image.sh -s debian8 -d mydocker/clang-debian8 -t "latest" \ -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BOOTSTRAP_TARGETS="install-clang;install-clang-headers" EOF -) - echo "$usage" } SEEN_INSTALL_TARGET=0 diff --git a/llvm/utils/docker/scripts/build_install_llvm.sh b/llvm/utils/docker/scripts/build_install_llvm.sh index 6016e3afe7d..642f16a84dd 100755 --- a/llvm/utils/docker/scripts/build_install_llvm.sh +++ b/llvm/utils/docker/scripts/build_install_llvm.sh @@ -11,7 +11,7 @@ set -e function show_usage() { - usage=$(cat << EOF + cat << EOF Usage: build_install_llvm.sh [options] -- [cmake-args] Checkout svn sources and run cmake with the specified arguments. Used @@ -37,8 +37,6 @@ Required options: At least one --install-target. All options after '--' are passed to CMake invocation. EOF -) - echo "$usage" } LLVM_SVN_REV="" |
